Index: /applications/editors/josm/i18n/po/ar.po
===================================================================
--- /applications/editors/josm/i18n/po/ar.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/ar.po	(revision 23252)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
-"PO-Revision-Date: 2010-09-06 00:11+0000\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
+"PO-Revision-Date: 2010-09-12 13:08+0000\n"
 "Last-Translator: Hsn <hh-shwaf@hotmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -83,6 +83,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -229,5 +229,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -249,5 +248,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -269,7 +268,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -390,5 +390,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -415,4 +415,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -420,5 +421,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -453,5 +454,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "المعلومات"
@@ -659,8 +660,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -672,5 +673,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "أحذف"
@@ -846,14 +847,14 @@
 msgstr "أخرُج من التطبيق."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "عرض ملء الشاشة"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "تبديل عرض ملء الشاشة"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr ""
@@ -896,26 +897,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -926,5 +923,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -932,37 +929,67 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "الرجاء إجهاض العملية إن لم تكن أكيداَ"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "مشروبات"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "أزل المختارة"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "تمت إضافة العقدة على كل التقطعات"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "صلّح العلاقات"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -970,33 +997,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "ادخل القيم لكل التناقضات."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "حلل التناقضات"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "صلّح تضاربات التسمية"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "أقسم الطريق {0} إلى {1} قطع"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "تم حذف العنصر من العلاقات"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr ""
@@ -1497,12 +1513,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1523,6 +1538,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1557,6 +1572,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "خطأ"
@@ -1588,5 +1603,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1695,5 +1710,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "اغلق"
@@ -1719,5 +1734,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr ""
@@ -1749,5 +1764,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1931,10 +1946,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2329,4 +2344,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2471,17 +2487,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2491,18 +2507,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2955,4 +2971,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3334,5 +3351,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "القيمة الجديدة"
@@ -3405,15 +3421,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "ملف إعدادات غير صحيح التكوين في الأسطر {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3422,5 +3438,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3429,5 +3445,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3436,5 +3452,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3443,5 +3459,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3449,5 +3465,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3456,5 +3472,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3463,5 +3479,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3470,20 +3486,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
 "Warning: Failed to initialize preferences.Failed to reset preference file to "
 "default: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 msgstr ""
 
@@ -3501,23 +3506,4 @@
 msgid "Could not load preferences from server."
 msgstr "لم أتمكن من تحميل التفضيلات من الخادم."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -3937,12 +3923,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "خطء حين إنشاء مجلد الخابية: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, 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:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
 msgstr ""
 
@@ -4066,5 +4067,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr ""
@@ -4234,10 +4235,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "إسم المستخدم"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4408,8 +4409,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4627,5 +4628,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5156,9 +5157,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5171,9 +5172,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5259,5 +5259,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr ""
@@ -5549,5 +5549,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5645,11 +5645,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "أضِف"
@@ -5994,10 +5994,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr ""
@@ -7646,9 +7646,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "أضف صفة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7657,13 +7657,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7671,10 +7671,10 @@
 msgstr "<مختلف>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "غيّر القيم ؟"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7683,5 +7683,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7690,77 +7690,86 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "الرجاء إختيار مفتاح"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "الرجاء إختيار قيمة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 msgid "Please select the objects you want to change properties for."
 msgstr "الرجاء إختيار الأغراض اللتي تريد تغيير خصائصها."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "خصائص/عضويات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "خصائص الأغراض المختارة."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "عضو من"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "الخصائص: {0} / العضويات: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "الخصائص/ العضويات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "غيّر العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "أمحي من العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "أمحي المفتاح المنتقى من كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "أمحي الخصائص"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "حرّر المحتاح المنقى لكلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "خصائص الأغراض المختارة."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr ""
@@ -8486,5 +8495,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9072,5 +9081,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11221,13 +11230,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "التفضيلات المتقدمة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11235,18 +11244,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "القيمة الحالية هي الغيابية."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "القيمة الغيابية هي ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr "القيمة الغيابية غير معروفة حالياً (لم يتم بعد التعيين)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "أدخل زوج جديد مفتاح/قيمة"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11254,20 +11274,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "القيمة الجديدة لِــ {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "أدخل زوج جديد مفتاح/قيمة"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "القيمة"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -11817,5 +11830,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "تمكين الغيابيات المبيتة"
@@ -12284,5 +12297,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12292,10 +12310,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12305,5 +12323,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12312,5 +12330,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12319,5 +12337,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12326,9 +12344,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr ""
@@ -14193,5 +14211,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "لا يوجدأي وصف"
@@ -14208,5 +14226,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr ""
@@ -14575,5 +14598,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -14666,4 +14689,28 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "غيّر الخصائص"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "إستورد صور"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "إستورد صور"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "خطء عند تحميل الصفحة {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15022,4 +15069,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15040,5 +15088,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15046,5 +15094,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -15529,8 +15577,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "الماء"
@@ -15591,6 +15639,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "العنوان"
@@ -16053,6 +16101,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr ""
@@ -16270,6 +16318,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+msgid "External tool error"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16292,5 +16347,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -16995,5 +17050,5 @@
 msgstr ""
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr ""
@@ -17762,4 +17817,9 @@
 msgstr ""
 
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "القيمة الجديدة لِــ {0}"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
@@ -19693,5 +19753,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr ""
@@ -19827,140 +19887,145 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "عزف\\مهلة"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "السابق"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "أقفظ إلى الأمام"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "مرّر"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "أسرع"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "أبطأ"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -19977,4 +20042,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20071,6 +20140,12 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "عبارة منتظمة"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20098,5 +20173,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr ""
@@ -20107,6 +20182,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "المرافق الرياضية"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20137,5 +20213,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr ""
@@ -20267,24 +20343,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20295,80 +20371,80 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20377,5 +20453,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20385,73 +20461,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "تكبير/تصغير"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "أزِل"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20514,5 +20601,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "غابة"
@@ -20806,6 +20893,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -20815,15 +20908,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr ""
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -20835,10 +20928,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -20846,10 +20939,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -20858,15 +20951,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -20875,20 +20968,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -20898,15 +20991,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -20914,5 +21007,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -20922,15 +21015,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -20939,5 +21032,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -20947,20 +21040,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20968,5 +21061,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20974,5 +21067,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20981,5 +21074,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -20988,10 +21081,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -20999,15 +21092,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "إسمح لتطبيقات أخرى بإرسال أوامر إلى د.أو.أس.أم."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21017,5 +21110,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21024,10 +21117,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21036,5 +21129,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21042,16 +21135,30 @@
 msgstr ""
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+msgid "Plugin for Seamap Editor"
+msgstr ""
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21061,15 +21168,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21078,5 +21185,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21085,5 +21192,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21092,10 +21199,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21104,5 +21211,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21112,5 +21219,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21119,20 +21226,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21141,5 +21248,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22033,4 +22140,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22038,5 +22189,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr ""
@@ -22543,5 +22694,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr ""
@@ -22590,5 +22741,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr ""
@@ -22621,6 +22772,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr ""
@@ -23779,5 +23930,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr ""
@@ -23975,7 +24126,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr ""
@@ -24251,8 +24402,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "سكة حديد"
@@ -25688,5 +25839,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr ""
@@ -26959,32 +27110,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "الرياضة"
@@ -28781,9 +28966,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "خضار"
@@ -30446,5 +30631,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr ""
@@ -30725,5 +30910,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -30741,5 +30926,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "مهجور"
@@ -31116,7 +31301,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr ""
@@ -31208,9 +31393,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr ""
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31220,5 +31413,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "مخاضة"
@@ -31237,7 +31430,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "رصيف محطة القطار"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "مستديرة دوران"
@@ -31252,5 +31458,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr ""
@@ -31264,5 +31470,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "شاطئ نهر"
@@ -31276,5 +31482,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "جدول نهر"
@@ -31288,5 +31494,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "حوض سفن"
@@ -31490,14 +31696,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "من صنع الإنسان"
@@ -31511,5 +31717,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -31571,7 +31777,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr ""
@@ -31594,10 +31800,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr ""
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr ""
@@ -31631,7 +31837,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "سكة حديد قديمة"
@@ -31676,6 +31882,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr ""
@@ -31697,5 +31903,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr ""
@@ -31709,5 +31915,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr ""
@@ -31785,8 +31991,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "خط جوي"
@@ -31802,5 +32008,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr ""
@@ -31814,5 +32020,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr ""
@@ -31826,5 +32032,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr ""
@@ -31838,5 +32044,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr ""
@@ -31850,5 +32056,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr ""
@@ -31862,5 +32068,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr ""
@@ -31980,11 +32186,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "طاقة"
@@ -31997,5 +32203,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "رصيف ميناء"
@@ -32009,5 +32215,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "خط أنابيب"
@@ -32151,13 +32357,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "وقت الفراغ"
@@ -32171,5 +32377,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "مارينا"
@@ -32265,10 +32471,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr ""
@@ -32378,11 +32584,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr ""
@@ -32820,24 +33026,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr ""
@@ -32869,6 +33075,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr ""
@@ -32929,8 +33135,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "صحة"
@@ -33291,26 +33497,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "متجر/دكان"
@@ -33382,8 +33588,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "فندق"
@@ -33483,9 +33689,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "سياحة"
@@ -33573,9 +33779,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "تاريخي"
@@ -33588,5 +33794,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "كسارة / مقلع حجارة"
@@ -33600,5 +33806,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr ""
@@ -33620,5 +33826,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "حوض"
@@ -33632,5 +33838,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "فناء مزرعة"
@@ -33653,5 +33859,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "بيع بلمفرق"
@@ -33665,5 +33871,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "صناعي"
@@ -33677,5 +33883,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr ""
@@ -33689,5 +33895,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "حقل خضار"
@@ -33701,5 +33907,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr ""
@@ -33756,7 +33962,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "عسكري"
@@ -33770,5 +33976,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "مقبرة/جبانة"
@@ -33781,5 +33987,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "قمّة"
@@ -33794,5 +34000,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "نهر الجليد"
@@ -33806,5 +34012,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "بركان"
@@ -33858,8 +34064,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "طبيعي"
@@ -33873,5 +34079,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "أشجار منخفضة"
@@ -33885,5 +34091,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "أرض بور"
@@ -33897,5 +34103,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr ""
@@ -33909,5 +34115,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "طين"
@@ -33921,5 +34127,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "شاطئ"
@@ -33997,8 +34203,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "طريق"
@@ -34087,12 +34293,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "الحدود"
@@ -34242,11 +34448,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "المكان"
@@ -34260,5 +34466,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -34627,4 +34833,10 @@
 msgstr ""
 
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "ادخل القيم لكل التناقضات."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "حلل التناقضات"
+
 #~ msgid "Unknown version"
 #~ msgstr "نسخة مجهولة"
@@ -34768,7 +34980,4 @@
 #~ msgstr "المشغول من"
 
-#~ msgid "Remove Selected"
-#~ msgstr "أزل المختارة"
-
 #~ msgid "Add all currently selected objects as members"
 #~ msgstr "أضف كلّ الأغراض المختارة حالياً كأعضاء"
@@ -34917,7 +35126,4 @@
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr "إيحاء: بعض التغييرات أتت نتيجةً لتحميل معطيات جديدة إلى الخادم."
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "خطء عند تحميل الصفحة {0}"
 
 #~ msgid "Errors during Download"
Index: /applications/editors/josm/i18n/po/bg.po
===================================================================
--- /applications/editors/josm/i18n/po/bg.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/bg.po	(revision 23252)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
 "PO-Revision-Date: 2010-09-05 23:56+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -234,5 +234,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -254,5 +253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -274,7 +273,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -397,5 +397,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -422,4 +422,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -427,5 +428,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -460,5 +461,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Информация"
@@ -670,8 +671,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -683,5 +684,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Изтриване"
@@ -859,14 +860,14 @@
 msgstr "Изход от програмата."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Преглед на цял екран"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Превключване режима на цял екран"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Превключване режима на цял екран"
@@ -909,26 +910,22 @@
 msgstr "Показва информация за OSM точки, пътища или връзки."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Обедини припокриващи се области"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Свързване на области, които се препокриват една с друга"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Само до две области могат да бъдат свързани към момента."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" не е затворен и съответно не може да бъде съединен."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -939,5 +936,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -945,37 +942,67 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Моля откажете се, ако не сте сигурни"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Няма намерено пресичане. Няма направени промени."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Създаване на списък с промени ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Изтриване на повтарящи се точки..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Добавен възел на всички кръстовища"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Изтриване Пътища, които не са част от вътрешен мултиполигон"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Поправяне на релации"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Свързана само-пресичаща се област"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Свързана пресичаща област"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -985,33 +1012,22 @@
 "проверете дали няма да се появят грешки."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Въведете стойности за всички конфликти."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Разрешаване на конфликти"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Поправяне конфликти маркери"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Разделяне пътен сегмент"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Премахнати елементи от връзки"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Присъедини области: премахване на кратки пътища"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Затворен Път"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Премахване на маркери от вътрешни пътища"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Функция свързване на области"
@@ -1516,12 +1532,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1542,6 +1557,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1576,6 +1591,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Грешка"
@@ -1607,5 +1622,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1720,5 +1735,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Затваряне"
@@ -1744,5 +1759,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Не, изход"
@@ -1774,5 +1789,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1971,10 +1986,10 @@
 msgstr "Незапелен възел"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Дублирай в {0} точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2370,4 +2385,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2519,17 +2535,17 @@
 msgstr[1] "Добавяне и преместване на виртуален нов възел към {0} пътя"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Преместване на елементи"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Премести"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Отмени преместването"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2539,9 +2555,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Отпуснете бутона на мишката за да изберете обектите в правоъгълника."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2550,9 +2566,9 @@
 "най-близката точка."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Отпуснете бутона на мишката за да спрете въртенето."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3022,4 +3038,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3413,5 +3430,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Нова стойност"
@@ -3484,15 +3500,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Внимание: неуспешно записване на предпочитанията в ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Грешка в конфигурационния файл на линии {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3503,5 +3519,5 @@
 "предпочитания ''{0}'' не е директория."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3512,5 +3528,5 @@
 "предпочитания ''{0}'' не е директория."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3521,5 +3537,5 @@
 "на липсваща директория за параметри: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3530,5 +3546,5 @@
 "липсваща директория за параметри: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3536,5 +3552,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3543,5 +3559,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3550,5 +3566,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3557,20 +3573,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
 "Warning: Failed to initialize preferences.Failed to reset preference file to "
 "default: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 msgstr ""
 
@@ -3588,25 +3593,4 @@
 msgid "Could not load preferences from server."
 msgstr "Невъзможно да се заредят предпочитанията от сървъра."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"Пропадна зареждането на отметки от ''{0}'' поради причини свързани със "
-"сигурността. Изключение на ОС: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4014,5 +3998,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "Грешен брой параметри на оператора за точки."
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Грешка при създаване на кеш директория: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
@@ -4020,9 +4025,4 @@
 "<html>Невъзможно прочитането на отметките от<br>''{0}''<br>Грешката е: {1}</"
 "html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>Отметката не може да бъде записана.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4141,5 +4141,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "сграда"
@@ -4315,10 +4315,10 @@
 msgstr "Ако е указано, да се нулира конфигурацията вместо да се прочете."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Потребителско име"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4489,8 +4489,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4709,5 +4709,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5241,9 +5241,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5256,9 +5256,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5344,5 +5343,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "няма/никой"
@@ -5630,5 +5629,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5726,11 +5725,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Добави"
@@ -6075,10 +6074,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr ""
@@ -7729,9 +7728,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Добавяне на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7740,13 +7739,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7754,10 +7753,10 @@
 msgstr "<различни>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Промени стойностите?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7766,5 +7765,5 @@
 msgstr[1] "Промяна параметрите на {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7773,77 +7772,86 @@
 msgstr[1] "Това ще промени до {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Моля, изберете ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Изберете стойност"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 msgid "Please select the objects you want to change properties for."
 msgstr "Моля, изберете обектите, чиито параметри искате да промените."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Параметри/Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Параметри на избраните обекти"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Член на"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Свойства: {0} / Членство: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Параметри / Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Промяна на връзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Изтриване от връзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Изваждане на избраните обекти от релация {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Изтриване на избрания ключ за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Изтриване на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавяне на нова двойка ключ/стойност за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Редактиране стойността на избрания ключ за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Параметри на избраните обекти"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr ""
@@ -8575,5 +8583,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9176,5 +9184,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11353,13 +11361,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Разширени настройки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Директна настройка на параметрите. Ползвайте внимателно."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11367,19 +11375,30 @@
 msgstr "Търси: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Текуща стойност по подразбиране."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Текущата стойност е ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
 "Стойност по подразбиране неизвестна (настройката все още не е използвана)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Моля, изберете ред за изтриване."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Въведете нова двойка ключ/стойност"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11387,20 +11406,13 @@
 msgstr "Моля, изберете ред за редактиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Нова стойност за {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Моля, изберете ред за изтриване."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Въведете нова двойка ключ/стойност"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Стойност"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -11980,5 +11992,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Използване на вградените настройки"
@@ -12450,5 +12462,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Не може да се прочете източник на шаблони за маркиране: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12458,10 +12475,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12471,5 +12488,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12478,5 +12495,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12485,5 +12502,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12492,9 +12509,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Сортиране меню шаблони"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Шаблони за маркиране"
@@ -14366,5 +14383,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "няма описание"
@@ -14381,5 +14398,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr ""
@@ -14751,5 +14773,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -14847,4 +14869,28 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Промяна параметри"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Импорт на изображения"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Импортирани изображения"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Грешка при зареждане на страница {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15205,4 +15251,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15223,5 +15270,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15229,5 +15276,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -15712,8 +15759,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "вода"
@@ -15774,6 +15821,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "адрес"
@@ -16255,6 +16302,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Празен слой"
@@ -16476,6 +16523,14 @@
 msgstr "Не е открит слой с GPX данни."
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Вътрешна грешка в сървъра"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16498,5 +16553,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17219,5 +17274,5 @@
 msgstr ""
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -18003,4 +18058,9 @@
 msgstr "Въведете стойности за тегло"
 
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Нова стойност за {0}"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
@@ -19958,5 +20018,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "област"
@@ -20094,140 +20154,145 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Изпълнение/Пауза"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Назад"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Прескочи напред"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Напред"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "По-бързо"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "По-бавно"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20244,4 +20309,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20338,6 +20407,12 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "регулярен израз"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20365,5 +20440,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Име на меню"
@@ -20374,6 +20449,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Спортни съоражения"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20404,5 +20480,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "WMS URL"
@@ -20536,24 +20612,24 @@
 "Това може да доведе до погрешни координати."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS слой ({0}), автоматично сваляне в мащаб {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS слой ({0}), сваляне в мащаб {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20568,17 +20644,17 @@
 "WMS въпреки всичко?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "Да, дръпни изображенията"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "Невалиден URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Сваляне на видимите квадранти"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20587,63 +20663,63 @@
 "разделителната способност."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Смяна разделителна способност"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Презареждане грешни квадранти"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Алфа канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Запис на WMS слоя във файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Запис на слоя WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Зареждане на WMS слой от файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "Четене на WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Неподдъжана WMS файлова версия; намерена {0}, очаквана {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Грешка във формата на файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Грешка при зареждане на файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Автоматично сваляне"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20652,5 +20728,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20660,73 +20736,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Отворете празен WMS слой за да заредите данни от файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Настройки модул WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Промяна списъка с WMS сървъри показвани в менюто на WMS разширението"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "Моля, изберете поне един ред за копиране"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Мащаб"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Име на меню (по подразбиране)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "WMS URL (по подразбиране)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "Моля, изберете поне един ред за копиране"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Премахни"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20793,5 +20880,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "залесена площ"
@@ -21085,6 +21172,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -21094,15 +21187,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr ""
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr "Специален handler за френския поземлен регистър WMS сървър."
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -21119,10 +21212,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "Създаване мрежа от пътища"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -21130,10 +21223,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21144,15 +21237,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "Дублира път с отместване."
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21161,20 +21254,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Сваляне GPS точки от Globalsat dg100 дата логер директно в JOSM."
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "Предоставя фонов слой, показващ мрежа на картата."
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21187,15 +21280,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "Помага за векторизиране на WMS изображения."
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21204,5 +21297,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21215,15 +21308,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21232,5 +21325,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21243,20 +21336,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "Показва OpenLayers фоново изображение"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Вкарва проблеми от OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21266,5 +21359,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21274,5 +21367,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21281,5 +21374,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21290,10 +21383,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Великият JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21301,15 +21394,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Позволява на други приложения да изпращат команди към JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21319,5 +21412,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21326,10 +21419,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Предоставя маршрутизиращи възможности."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21338,5 +21431,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21346,16 +21439,31 @@
 "(изображения) от подвижната карта във фонов режим и да изисква обновления."
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "Информация за добавка"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Позволява добавянето на маркери/възли на текущата gps позиция."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Предоставя диалог за редактиране на маркери в табличен вид."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21369,15 +21477,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "Създава терасовидни къщи от един блок."
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21386,5 +21494,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21393,5 +21501,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21400,10 +21508,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21415,5 +21523,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21423,5 +21531,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21430,20 +21538,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21452,5 +21560,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22344,4 +22452,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22349,5 +22501,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "кръгово"
@@ -22854,5 +23006,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "улица"
@@ -22901,5 +23053,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "служебна"
@@ -22932,6 +23084,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "ремонт"
@@ -24090,5 +24242,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "блато"
@@ -24286,7 +24438,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "велосипед"
@@ -24562,8 +24714,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "ЖП"
@@ -25999,5 +26151,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "терминал"
@@ -27270,32 +27422,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "спорт"
@@ -29092,9 +29278,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "зеленина"
@@ -30757,5 +30943,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "метро"
@@ -31036,5 +31222,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31052,5 +31238,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "остарял, вече невалиден"
@@ -31427,7 +31613,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "път_от_пътна_мрежа"
@@ -31519,9 +31705,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "услуги"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31531,5 +31725,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "форд"
@@ -31548,7 +31742,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "път_от_пътна_мрежа"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "обръщало"
@@ -31563,5 +31770,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr "точка за връзка със спешна помощ"
@@ -31575,5 +31782,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "речен бряг"
@@ -31587,5 +31794,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "поток"
@@ -31599,5 +31806,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "док"
@@ -31801,14 +32008,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "изкуствени съоръжения"
@@ -31822,5 +32029,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -31882,7 +32089,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "ЖП точка"
@@ -31905,10 +32112,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "друга ЖП линия"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "ЖП railover"
@@ -31942,7 +32149,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "стара ЖП линия"
@@ -31987,6 +32194,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "въздушен транспорт"
@@ -32008,5 +32215,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "Надземен_транспорт_тъмен"
@@ -32020,5 +32227,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "Надземен_транспорт_светъл"
@@ -32096,8 +32303,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "надземен транспорт"
@@ -32113,5 +32320,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "лесна ски писта"
@@ -32125,5 +32332,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "средно трудна ски писта"
@@ -32137,5 +32344,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "ски писта за напреднали"
@@ -32149,5 +32356,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr "ски писта за експерти"
@@ -32161,5 +32368,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "ски писта freeride"
@@ -32173,5 +32380,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "ски писта за начинаещи"
@@ -32291,11 +32498,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "захранване"
@@ -32308,5 +32515,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "кей"
@@ -32320,5 +32527,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "тръбопровод"
@@ -32462,13 +32669,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "отдих и развлечение"
@@ -32482,5 +32689,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "яхт пристан"
@@ -32576,10 +32783,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "Обществени услуги"
@@ -32689,11 +32896,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "Обществен трафик"
@@ -33131,24 +33338,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "Обществено осветление"
@@ -33180,6 +33387,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "светла_вода"
@@ -33240,8 +33447,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "здравеопазване"
@@ -33602,26 +33809,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "магазин"
@@ -33693,8 +33900,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "хотел"
@@ -33794,9 +34001,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "туризъм"
@@ -33884,9 +34091,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "исторически"
@@ -33899,5 +34106,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "кариера"
@@ -33911,5 +34118,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "сметище"
@@ -33931,5 +34138,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "басейн"
@@ -33943,5 +34150,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "двор ферма"
@@ -33964,5 +34171,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "търговия на дребно"
@@ -33976,5 +34183,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "индустрия"
@@ -33988,5 +34195,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "индустриални развалини"
@@ -34000,5 +34207,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "зелена площ"
@@ -34012,5 +34219,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "ЖП"
@@ -34067,7 +34274,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "военни"
@@ -34081,5 +34288,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "гробище"
@@ -34092,5 +34299,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "връх"
@@ -34105,5 +34312,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "ледник"
@@ -34117,5 +34324,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "вулкан"
@@ -34169,8 +34376,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "природа"
@@ -34184,5 +34391,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "храсталак"
@@ -34196,5 +34403,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "пустош"
@@ -34208,5 +34415,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "гориста местност"
@@ -34220,5 +34427,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "кал"
@@ -34232,5 +34439,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "плаж"
@@ -34308,8 +34515,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "маршрут"
@@ -34398,12 +34605,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "граница"
@@ -34553,11 +34760,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "място"
@@ -34571,5 +34778,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -34937,4 +35144,32 @@
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Само до две области могат да бъдат свързани към момента."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Свързана само-пресичаща се област"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Въведете стойности за всички конфликти."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Разрешаване на конфликти"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Присъедини области: премахване на кратки пътища"
+
+#~ msgid "Closed Way"
+#~ msgstr "Затворен Път"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Пропадна зареждането на отметки от ''{0}'' поради причини свързани със "
+#~ "сигурността. Изключение на ОС: {1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>Отметката не може да бъде записана.<br>{0}</html>"
 
 #~ msgid ""
@@ -35641,7 +35876,4 @@
 #~ msgstr "Разрешаване {0} конфликти в {1} обекти"
 
-#~ msgid "Split way segment"
-#~ msgstr "Разделяне пътен сегмент"
-
 #~ msgid "Malformed sentences: "
 #~ msgstr "Неправилно съставено изречение: "
@@ -35723,7 +35955,4 @@
 #~ msgstr ""
 #~ "Възможно е да се редактират само справочните страници на JOSM Online Help"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Грешка при зареждане на страница {0}"
 
 #~ msgid "The selected way does not contain the selected node."
@@ -36117,7 +36346,4 @@
 #~ msgstr "Изтрити или преместени примитиви"
 
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Грешен брой параметри на оператора за точки."
-
 #~ msgid "An error occurred while saving. Error is: {0}"
 #~ msgstr "Възникна грешка при записа. Грешката е: {0}"
Index: /applications/editors/josm/i18n/po/cs.po
===================================================================
--- /applications/editors/josm/i18n/po/cs.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/cs.po	(revision 23252)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
 "PO-Revision-Date: 2010-09-06 00:28+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:52+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -235,5 +235,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -255,5 +254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -275,7 +274,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -398,5 +398,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -423,4 +423,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -428,5 +429,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -461,5 +462,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Informace"
@@ -670,8 +671,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -683,5 +684,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Smazat"
@@ -857,14 +858,14 @@
 msgstr "Ukončit JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Celoobrazovkový režim"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Přepnout celoobrazovkový pohled"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Přepnout celoobrazovkový pohled"
@@ -907,26 +908,22 @@
 msgstr "Zobrazit informace o OSM bodech, cestách nebo relacích."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Spojit překrývající se plochy"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Spojí plochy, které se navzájem překrývají"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "Prosím vyberte jednu uzavřenou cestu která bude připojena."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Aktuálně lze sloučit maximálně pouze dvě plochy."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" není uzavřená plocha a tedy nelze spojit."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -938,5 +935,5 @@
 msgstr[2] "Zvolené cesty mají uzly mimo stahovanou oblast"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -944,37 +941,67 @@
 msgstr "Toto může védst k náhodnému smazání uzlů."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Opravdu pokračovat ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Prosíme přerušte, pokud si nejste jisti"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Nenalezen žádný průnik. Nic se nemění."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Vrátit zpět sadu změn"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Odstraňuji duplicitní uzly..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Přidány body na všechny průsečíky"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Smazat cesty, které nejsou součástí vnižního multipolygonu."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Opravit relace."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Spojena plocha překrývající sama sebe"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Spojeny překrývající se plochy"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -984,33 +1011,22 @@
 "tímto nedošlo ke vzniku chyb."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Zadej hodnoty pro všechny konflikty"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Vyřešit konflikty"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Opravit konflikty značek"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Rozdělit segment cesty"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Prvek odstraněn z relací"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Spojit plochy: Vymazat krátké cesty"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Uzavřená cesta"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Odstranit tagy z vnitřních cest"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Funkce spojení ploch"
@@ -1520,12 +1536,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1546,6 +1561,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1580,6 +1595,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Chyba"
@@ -1611,5 +1626,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1724,5 +1739,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Zavřít"
@@ -1748,5 +1763,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Ne, zrušit"
@@ -1778,5 +1793,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1976,10 +1991,10 @@
 msgstr "Nespojený uzel"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Duplikovat do {0} uzlů"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2382,4 +2397,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2528,17 +2544,17 @@
 msgstr[2] "Přidat a posunout virtuální nový uzel do {0} cest"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Přesun prvků"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Přesunout je"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Vrátit zpět přesun"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2551,9 +2567,9 @@
 "Opravdu přesunout?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 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"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2561,9 +2577,9 @@
 "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:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Pusťte myší tlačítko k zastavení otaáčení"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3045,4 +3061,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3442,5 +3459,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Nová hodnota"
@@ -3513,15 +3529,15 @@
 msgstr "Neplatná zeměpisná délka ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, 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:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3532,5 +3548,5 @@
 "adresářem."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3539,5 +3555,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3546,5 +3562,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3553,5 +3569,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3559,5 +3575,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3566,5 +3582,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3573,5 +3589,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3580,20 +3596,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
 "Warning: Failed to initialize preferences.Failed to reset preference file to "
 "default: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Chyba: neočekávaná řádka ''{0}'' v souboru záložek ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 msgstr ""
 
@@ -3611,25 +3616,4 @@
 msgid "Could not load preferences from server."
 msgstr "Nemohu nahrát předvolby ze serveru."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"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:47
@@ -4041,13 +4025,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "Chybný počet parametrů pro operátor nodes."
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Chyba při vytváření cache adresáře: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Chyba: neočekávaná řádka ''{0}'' v souboru záložek ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 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>"
-msgstr "<html>Záložku nelze uložit.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4167,5 +4167,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "budova"
@@ -4342,10 +4342,10 @@
 msgstr "Pokud je nastaveno, smaže se konfigurace, místo jejího načtení"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Jméno uživatele"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4518,8 +4518,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4744,5 +4744,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5298,9 +5298,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5313,9 +5313,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5401,5 +5400,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "nic"
@@ -5698,5 +5697,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5796,11 +5795,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Přidat"
@@ -6146,10 +6145,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "Vybrat relaci v seznamu relací."
@@ -7812,9 +7811,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Přidat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7824,13 +7823,13 @@
 msgstr[2] "Toto změní {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "Prázdná hodnota smaže tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7838,10 +7837,10 @@
 msgstr "<různé>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Změnit hodnoty ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7851,5 +7850,5 @@
 msgstr[2] "Změnit vlastnosti až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7859,77 +7858,86 @@
 msgstr[2] "Toto změní až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Prosím zvolte klíč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Vyberte prosím hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 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/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Vlastnosti/Členství"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Vlastnosti pro zvolené objekty"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Člen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr "Pozice"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Členství: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Členství"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Změnit relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Odstranit z relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Opravdu smazat výběr z relace {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Smaže zvolený klíč ve všech objektech"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Smazat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Přidat nový pár klíč/hodnota ke všem objektům"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Vlastnosti pro zvolené objekty"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "Vybrat relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "Vyberte relaci v hlavním výběru."
@@ -8679,5 +8687,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9298,5 +9306,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11536,13 +11544,13 @@
 msgstr "Získávám informace o uživateli..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Pokročilé volby"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Ruční nastavení. Používejte s opatrností!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11550,18 +11558,29 @@
 msgstr "Hledání: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Nynějsí hodnota je výchozí"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Výchozí hodnota je''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr "Výchozí hodnota není známa ( ještě nebyla definována )"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Zvolte řádek k vymazání"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Zadejte novou dvojici klíč/hodnota"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11569,20 +11588,13 @@
 msgstr "Zvolte řádek k editaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Nová hodnota pro {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Zvolte řádek k vymazání"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Zadejte novou dvojici klíč/hodnota"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Hodnota"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12137,5 +12149,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Povolit vestavěné výchozí hodnoty"
@@ -12614,5 +12626,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Nelze načíst zdroj přednastavených tagů: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12622,10 +12639,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12635,5 +12652,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12642,5 +12659,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12649,5 +12666,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12656,9 +12673,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Setřídit nabídku s přednastaveními"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Přednastavení tagů"
@@ -14584,5 +14601,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "není zádný popis"
@@ -14600,5 +14617,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "Více informací..."
@@ -14987,5 +15009,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -15081,4 +15103,28 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Změnit vlastnosti"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Importovat obrázky"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Importované obrázky"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Chyba při načítání stránky {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15437,4 +15483,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr "Srovnat cesty"
@@ -15455,5 +15502,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr "Jsem připraven!"
@@ -15461,5 +15508,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -15952,8 +15999,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "voda"
@@ -16014,6 +16061,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "adresa"
@@ -16492,6 +16539,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Prázdná vrstva"
@@ -16714,6 +16761,14 @@
 msgstr "Nenalezena vrstva s GPX daty."
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Interní chyba serveru"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16736,5 +16791,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17454,5 +17509,5 @@
 msgstr "Musíte vybrat alespoň dvě cesty."
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -18238,4 +18293,9 @@
 msgstr "Zadejte jednotky váhy"
 
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Nová hodnota pro {0}"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
@@ -20200,5 +20260,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "oblast"
@@ -20334,140 +20394,145 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Přehrát/Pauza"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Zpět"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Skok vpřed"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Vpřed"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Rychleji"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Pomaleji"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20484,4 +20549,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20578,6 +20647,12 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Zadejte hledaný výraz"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20605,5 +20680,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Jméno v menu"
@@ -20614,6 +20689,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Sportovní zařízení"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20644,5 +20720,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "WMS URL"
@@ -20777,5 +20853,5 @@
 "Toto může vést ke špatným souřadnicím."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -20784,19 +20860,19 @@
 "url ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr "(deaktivované)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), automatické stahování v přiblížení {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), stahování v přiblížení {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20811,17 +20887,17 @@
 "znovu?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "Ano, stahovat obrázky"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "Neplatné URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Nahrát viditelné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20829,63 +20905,63 @@
 "Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Změnit rozlišení"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Znovu nahrát chybné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Uložit WMS vrstvu do souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Uložit WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Nahrát WMS vrstvu ze souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "Načíst vrstvu WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Nepodporovaná verze WMS souboru; nalezeno {0}, očekáváno {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Chyba formátu souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Chyba při nahrávání souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "Nastavit záložku WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Automatické stahování"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20894,5 +20970,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20902,73 +20978,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "K nahrání dat ze souboru otevřete nejprve prázdnou WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Nastavení pluginu WMS Plugin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Upravit seznam WMS serverů zobrazený v menu WMS pluginu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "Kopírovat zvolené výchozí hodnoty"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "Vyberte alespoň jeden řádek pro kopírování"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "Stahovač:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "Překryv dlaždic"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "% na východ:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "% na sever:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Zvětšení"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Jméno v menu (výchozí)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "WMS URL (výchozí)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "Kopírovat zvolené výchozí hodnoty"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "Vyberte alespoň jeden řádek pro kopírování"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "Stahovač:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "Překryv dlaždic"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "% na východ:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "% na sever:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Odstranit"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21035,5 +21122,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "les"
@@ -21327,6 +21414,12 @@
 msgstr "Sytost:"
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -21336,15 +21429,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr "Nástroj pro tvorbu budov."
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -21360,10 +21453,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "Plugin Vytvořit pravidelné sítě cest"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -21371,10 +21464,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Umožňuje importovat rozličné formáty souborů přímo do JOSM."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21385,15 +21478,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "Plugin Duplikovat_cestu"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21404,20 +21497,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Stahuje GPS body z Globalsat dg100 data loggeru přímo do JOSM."
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr "Vizualizuje informace o směrování v podobě grafu."
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "Poskytuje vrstvu na pozadí zobrazující mřížku mapy"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21427,10 +21520,10 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr ""
@@ -21439,5 +21532,5 @@
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21446,5 +21539,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21457,15 +21550,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21476,5 +21569,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21487,20 +21580,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "Zobrazuje na pozadí obrázek z OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importuje problémy z OpenStreetBugs."
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21509,5 +21602,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21516,5 +21609,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21523,5 +21616,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21532,10 +21625,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Ohromný JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21543,15 +21636,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Umožní jiné aplikace posílat příkazy do JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr "Plugin pro vracení sad změn zpět (revert)"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21561,5 +21654,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21570,10 +21663,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Poskytuje směrování"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21582,5 +21675,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21590,16 +21683,31 @@
 "jako pozadí a požadovat aktualizace."
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "Informace o pluginu"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Umožní přidat ukazatele/body na současnou GPS polohu."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Poskytuje dialog umožňující editovat tagy v tabulce."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21609,15 +21717,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "Vytváření řadových domků z jednotlivých bloků."
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21626,5 +21734,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21635,5 +21743,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21644,10 +21752,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr "Umožňuje obnovování smazaných objektů z OSM databáze"
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21658,5 +21766,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21666,5 +21774,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21675,20 +21783,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Snadné stahovaní velmi dlouhých propojených cest"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Vyberte sekvenci nevětvících se spojených cest"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21697,5 +21805,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22590,4 +22698,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22595,5 +22747,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "kruhový objezd"
@@ -23100,5 +23252,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "obytná oblast"
@@ -23147,5 +23299,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "obslužná cesta"
@@ -23178,6 +23330,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "konstrukce"
@@ -24336,5 +24488,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "mokřina"
@@ -24532,7 +24684,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "bicykl"
@@ -24808,8 +24960,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "železnice"
@@ -26245,5 +26397,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "terminál"
@@ -27516,32 +27668,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "sport"
@@ -29338,9 +29524,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "zeleň"
@@ -31003,5 +31189,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "metro"
@@ -31282,5 +31468,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31298,5 +31484,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "zastaralý"
@@ -31673,7 +31859,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "dálnice"
@@ -31765,9 +31951,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "služby"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31777,5 +31971,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "brod"
@@ -31794,7 +31988,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "dálnice"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr ""
@@ -31809,5 +32016,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr ""
@@ -31821,5 +32028,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "říční břeh"
@@ -31833,5 +32040,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "potok"
@@ -31845,5 +32052,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "dok"
@@ -32047,14 +32254,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr ""
@@ -32068,5 +32275,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -32128,7 +32335,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr ""
@@ -32151,10 +32358,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr ""
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr ""
@@ -32188,7 +32395,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr ""
@@ -32233,6 +32440,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr ""
@@ -32254,5 +32461,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr ""
@@ -32266,5 +32473,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr ""
@@ -32342,8 +32549,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "lanovka"
@@ -32359,5 +32566,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "lehká sjezdovka"
@@ -32371,5 +32578,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "střední sjezdovka"
@@ -32383,5 +32590,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "těžká sjezdovka"
@@ -32395,5 +32602,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr "sjezdovka pro experty"
@@ -32407,5 +32614,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr ""
@@ -32419,5 +32626,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "sjezdovka pro začátečníky"
@@ -32537,11 +32744,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "energetika"
@@ -32554,5 +32761,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "molo"
@@ -32566,5 +32773,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "potrubí"
@@ -32708,13 +32915,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "oddych (leisure)"
@@ -32728,5 +32935,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "přísav"
@@ -32822,10 +33029,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "občanská vybavenost"
@@ -32935,11 +33142,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr ""
@@ -33377,24 +33584,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr ""
@@ -33426,6 +33633,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "menší vodní plochy"
@@ -33486,8 +33693,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "zdravotnictví"
@@ -33848,26 +34055,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "obchod"
@@ -33939,8 +34146,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hotel"
@@ -34040,9 +34247,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "turistika"
@@ -34130,9 +34337,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "historické"
@@ -34145,5 +34352,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "lom"
@@ -34157,5 +34364,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "skládka"
@@ -34177,5 +34384,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "nádrže"
@@ -34189,5 +34396,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "zemědělství"
@@ -34210,5 +34417,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "obchody"
@@ -34222,5 +34429,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "průmysl"
@@ -34234,5 +34441,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "stará zátěž, městské ruiny (Brownfield)"
@@ -34246,5 +34453,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "Zastavitelné území (Greenfield)"
@@ -34258,5 +34465,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "železniční plochy"
@@ -34313,7 +34520,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "vojenský"
@@ -34327,5 +34534,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "hřbitov"
@@ -34338,5 +34545,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "vrchol"
@@ -34351,5 +34558,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "ledovec"
@@ -34363,5 +34570,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "sopka"
@@ -34415,8 +34622,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "přírodní"
@@ -34430,5 +34637,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "křoví"
@@ -34442,5 +34649,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "vřesoviště"
@@ -34454,5 +34661,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "zalesněné území"
@@ -34466,5 +34673,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "bahno"
@@ -34478,5 +34685,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "pláž"
@@ -34554,8 +34761,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "cesta"
@@ -34644,12 +34851,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "hranice"
@@ -34799,11 +35006,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "místo"
@@ -34817,5 +35024,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr "tiger_data"
@@ -35184,4 +35391,32 @@
 msgstr ""
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Aktuálně lze sloučit maximálně pouze dvě plochy."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Spojena plocha překrývající sama sebe"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Zadej hodnoty pro všechny konflikty"
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Vyřešit konflikty"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Spojit plochy: Vymazat krátké cesty"
+
+#~ msgid "Closed Way"
+#~ msgstr "Uzavřená cesta"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Z bezpečnostních důvodů se nepodařilo se načíst záložky z  ''{0}''. "
+#~ "Výjimka: {1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>Záložku nelze uložit.<br>{0}</html>"
+
 #~ msgid "Email"
 #~ msgstr "E-mail"
@@ -35279,7 +35514,4 @@
 #~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 #~ msgstr "Zadejte datum ve tvaru (mm/dd/rrrr HH:MM:SS)"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Chyba při načítání stránky {0}"
 
 #~ msgid "Cannot connect to server."
@@ -35423,7 +35655,4 @@
 #~ msgid "Conflicting relation"
 #~ msgstr "Konfliktní relace"
-
-#~ msgid "Split way segment"
-#~ msgstr "Rozdělit segment cesty"
 
 #~ msgid "Merging conflicts."
@@ -36175,7 +36404,4 @@
 #~ msgid "Upload to OSM API failed"
 #~ msgstr "Nahrándí do OSM API selhalo"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Chybný počet parametrů pro operátor nodes."
 
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
Index: /applications/editors/josm/i18n/po/da.po
===================================================================
--- /applications/editors/josm/i18n/po/da.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/da.po	(revision 23252)
@@ -9,7 +9,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
-"PO-Revision-Date: 2010-09-06 01:09+0000\n"
-"Last-Translator: Lasse Luttermann <luttermann@silenzio.dk>\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
+"PO-Revision-Date: 2010-09-13 12:22+0000\n"
+"Last-Translator: Peter Brodersen <Unknown>\n"
 "Language-Team: Dansk <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:56+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -83,6 +83,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -235,5 +235,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -255,5 +254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -275,7 +274,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -398,5 +398,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -423,4 +423,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -428,5 +429,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -461,5 +462,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Information"
@@ -672,8 +673,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -685,5 +686,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Slet"
@@ -859,14 +860,14 @@
 msgstr "Afslut programmet."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Vis i fuldskærm"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Slå fuldskærmsvisning til/fra"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Slå fuldskærmsvisning til/fra"
@@ -909,26 +910,22 @@
 msgstr "Vis objekt-information for OSM-veje, -punkter eller -relationer."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Foren overlappende områder"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Forener områder der overlapper hinanden"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "Vælg mindst en lukket vej der skal forbindes."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Kun op til to områder kan forenes i øjeblikket"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" er ikke lukket og kan derfor ikke forenes."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -939,5 +936,5 @@
 msgstr[1] "De valgte veje har noder udenfor det downloadede dataområde"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -945,37 +942,67 @@
 msgstr "Dette kan føre til at punkter bliver fejlagtigt slettet."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Er du sikker på at du vil fortsætte?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Afbryd hvis du ikke er sikker"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Intet skæringspunkt fundet. Intet blev ændret."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Opretter rettesæt..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Dublet-punkter"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Tilføjede punkter ved alle skæringspunkter"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Slet veje, som ikke er dele af en indre multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Ret relationer"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Forbandt selv-overlappende område"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Forbandt overlappende områder"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -985,33 +1012,22 @@
 "venligst at ingen nye fejl er blevet introduceret."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Indtast værdier for alle konflikter."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Løs konflikter"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Løs tag konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Opdel vejstykke"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Fjernede element fra relationer"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Sammenlæg områder: Fjern korte veje"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Lukket vej"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Fjern tags fra indre veje"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Funktion til sammenlægning af områder"
@@ -1201,5 +1217,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24
 msgid "Edit latitude and longitude of a node."
-msgstr ""
+msgstr "Rediger breddegrad og længdegrad for et punkt."
 
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
@@ -1310,4 +1326,9 @@
 "shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
 msgstr ""
+"<h3>Når en eller flere veje er markeret bliver formen justeret, så alle "
+"vinkler er 90 eller 180 grader.</h3>Du kan tilføje to punkter til "
+"markeringen. Så vil retningen blive justeret efter disse referencepunkter. "
+"(Bagefter kan du annullere flytningen af enkelte punkter:<br>Vælg dem og "
+"tast genvejen for Retvinkel/fortryd. Standard-genvejen er Shift-Q)"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1457,5 +1478,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
 msgid "Purge..."
-msgstr ""
+msgstr "Ryd..."
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
@@ -1466,9 +1487,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
-msgstr ""
+msgstr "Ryd"
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
-msgstr ""
+msgstr "Bekræft rydning"
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
@@ -1487,5 +1508,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
-msgstr ""
+msgstr "Tilføj til valgt"
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
@@ -1497,5 +1518,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
 msgid "Clear Undo/Redo buffer"
-msgstr ""
+msgstr "Slet fortryd/genskab-oversigten"
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1527,12 +1548,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1553,6 +1573,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1587,6 +1607,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Fejl"
@@ -1594,5 +1614,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:54
 msgid "Reverse way"
-msgstr ""
+msgstr "Vend vej om"
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:67
@@ -1618,5 +1638,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1729,5 +1749,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Luk"
@@ -1753,5 +1773,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Nej, afbryd"
@@ -1783,5 +1803,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1835,4 +1855,5 @@
 "The current selection cannot be used for splitting - no node is selected."
 msgstr ""
+"Det nuværende valgte kan ikke bruges til opdeling - intet punkt er valgt."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -1976,10 +1997,10 @@
 msgstr "Skilte punkt i to"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Nar ind i {0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2319,5 +2340,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:178
 msgid "Deleted or moved objects"
-msgstr ""
+msgstr "Slettede eller flyttede objekter"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:244
@@ -2378,4 +2399,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2526,17 +2548,17 @@
 msgstr[1] "Tilføj og flyt et virtuelt nyt punkt til {0} veje"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Flyt elementer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Flyt dem"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Fortryd flytning"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2549,9 +2571,9 @@
 "Vil du virkelig flytte dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Slip museknappen for at vælge objekterne inden i firkanten."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2560,9 +2582,9 @@
 "nærmeste punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Slip museknappen for at stoppe rotationen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3052,4 +3074,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3444,5 +3467,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Ny værdi"
@@ -3515,15 +3537,15 @@
 msgstr "Ulovlig længdegradsværdi ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Advarsel: Kunne ikke gemme indstillinger i \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Fejl i konfigurationsfilen ved linjerne {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3534,5 +3556,5 @@
 "er ikke en mappe."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3543,5 +3565,5 @@
 "ikke en mappe.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3552,5 +3574,5 @@
 "manglende indstillingsmappe: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3561,5 +3583,5 @@
 "indstillingsmappe: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3569,5 +3591,5 @@
 "indstillingsfil."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3578,5 +3600,5 @@
 "indstillingsfil."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3587,5 +3609,5 @@
 "indstillingsfil til standard: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3596,5 +3618,5 @@
 "<br> og opretter en ny standard-indstillingsfil.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3604,16 +3626,4 @@
 "Advarsel: Kunne ikke initialisere indstillinger. Kunne ikke nulstille "
 "indstillingsfil til standard: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Fejl: Uventet linje ''{0}'' i bogmærkefil ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Fejl: Ulovlig double værdi ''{0}'' i linje ''{1}'' i bogmærkefil ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3630,26 +3640,4 @@
 msgid "Could not load preferences from server."
 msgstr "Kunne ikke hente indstillinger fra serveren."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr "Fejl: Uventet linje ''{0}'' i bogmærkeliste fra server"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-"Fejl: Ulovlig double værdi ''{0}'' i linje ''{1}'' i bogmærkeliste fra server"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"Kunne af sikkerhedsårsager ikke hente bogmærke fra \"{0}\". Undtagelse var: "
-"{1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4071,13 +4059,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "Forkert antal parametre for punkt operatør."
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Fejl ved oprettelse af mellemlager-mappe: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Fejl: Uventet linje ''{0}'' i bogmærkefil ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Fejl: Ulovlig double værdi ''{0}'' i linje ''{1}'' i bogmærkefil ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr "<html>Kunne ikke læse bogmærker fra<br>''{0}''<br>Fejl var: {1}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>Kunne ikke skrive bogmærke.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4196,5 +4201,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "bygning"
@@ -4371,10 +4376,10 @@
 msgstr "Hvis angivet, nulstil konfigurationen i stedet for at indlæse den."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Brugernavn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4549,8 +4554,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4777,5 +4782,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5338,9 +5343,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5353,9 +5358,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5441,5 +5445,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "intet"
@@ -5751,5 +5755,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5851,11 +5855,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Tilføj"
@@ -6201,10 +6205,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "Markér i relationsliste"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "Markér relation i relationsliste."
@@ -7893,9 +7897,9 @@
 msgstr "Denne rettesætsforespørgselsURL er ugyldig"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Tilføj egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7904,13 +7908,13 @@
 msgstr[1] "Dette vil ændre op til {0} objekter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "En tom værdi sletter taggen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7918,10 +7922,10 @@
 msgstr "<forskellige>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Ret værdier?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7930,5 +7934,5 @@
 msgstr[1] "Ret egenskaber for op til {0} objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7937,77 +7941,86 @@
 msgstr[1] "Dette vil ændre på op til {0} objekter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Vælg venligst en nøgle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Vælg venligst en værdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 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/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Egenskaber/medlemsskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Egenskaber for valgte objekter."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Medlem af"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaber: {0} / Medlemskaber: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Egenskaber / Medlemskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Skift relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Slet fra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Slet virkelig det markerede fra relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøgle i alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Fjern egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Tilføj et nyt nøgle/værdi-sæt til alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Ret værdien for den valgte nøgle for alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Egenskaber for valgte objekter."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "Markér relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "Vælg relation i hovedmarkering."
@@ -8773,5 +8786,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9403,5 +9416,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11664,13 +11677,13 @@
 msgstr "Henter brugerinfo..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Udvidede indstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Ret indstillingerne direkte. Vær varsom!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11678,14 +11691,14 @@
 msgstr "Søg: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Nuværende værdi er standard."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Standardværdien er \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
@@ -11693,5 +11706,16 @@
 "endnu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Vælg venligst rækken, der skal slettes"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Indtast et nyt nøgle/værdi-sæt"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11699,20 +11723,13 @@
 msgstr "Vælg venligst rækken, der skal rettes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Ny værdi for {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Vælg venligst rækken, der skal slettes"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Indtast et nyt nøgle/værdi-sæt"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Værdi"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12285,5 +12302,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Slå indbyggede standarder til"
@@ -12757,5 +12774,10 @@
 msgstr "Advarsel: Ulovligt format for linje i stilliste ''{0}''. Fik ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Kunne ikke læse kilde med fordefinerede tags: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12765,10 +12787,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12778,5 +12800,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12785,5 +12807,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12792,5 +12814,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12799,9 +12821,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Sortér menu med fordefinerede tags"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Fordefinerede tags"
@@ -14739,5 +14761,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "Ingen beskrivelse er tilgængelig"
@@ -14754,5 +14776,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr ""
@@ -15152,5 +15179,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -15248,4 +15275,28 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Ret egenskaber"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Importér billeder"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Snup ikke-georeferenceret billede"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Fejl ved indlæsning af siden {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15609,4 +15660,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15627,5 +15679,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15633,5 +15685,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -16118,8 +16170,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "vand"
@@ -16180,6 +16232,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "adresse"
@@ -16653,6 +16705,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Tomt lag"
@@ -16873,6 +16925,14 @@
 msgstr "Intet GPX-datalag blev fundet"
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Intern server fejl"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16895,5 +16955,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17601,5 +17661,5 @@
 msgstr "Du skal vælge mindst 2 veje."
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -18380,4 +18440,9 @@
 msgstr "Indtast vægtede værdier"
 
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Ny værdi for {0}"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
@@ -20338,5 +20403,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "område"
@@ -20475,140 +20540,145 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Afspil/pause"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Tilbage"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Hop fremad"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Fremad"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Hurtigere"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Langsommere"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20625,4 +20695,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20730,6 +20804,12 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Angiv et søgeudtryk"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20757,5 +20837,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Navn på menu"
@@ -20766,6 +20846,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Sportsfaciliteter"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20796,5 +20877,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "WMS-URL"
@@ -20933,24 +21014,24 @@
 "Dette kan føre til forkerte koordinater."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr "Advarsel: WMS-lag deaktiveret på grund af misformet basal URL \"{0}\""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr "(deaktiveret)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-lag ({0}) downloader automatisk i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-lag ({0}) downloader i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20965,17 +21046,17 @@
 "hente WMS-tern alligevel?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "Ja hent billeder"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "Ugyldig URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Download synlige tern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20984,63 +21065,63 @@
 "opløsningen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Skift opløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Genhent fejlagtige tern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Alpha-kanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Gem WMS-lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Gem WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Indlæs WMS-lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "Indlæs WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "WMS-filversion ikke understøttet; fandt {0}, forventede {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Fil format fejl"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Fejl ved indlæsning af fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "Sæt WMS-bogmærke"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Automatisk download"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -21049,5 +21130,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -21057,73 +21138,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Åbn et tomt WMS-lag at indlæse data til fra en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Indstillinger for WMS-udvidelse"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Redigér listen over WMS-servere, som vises i WMS-udvidelsesmenuen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "Vælg mindst en række at kopiere."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "Downloader:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "% af øst:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "% af nord:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Navn på menu (standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "WMS-URL (standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "Vælg mindst en række at kopiere."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "Downloader:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "% af øst:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "% af nord:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Fjern"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21191,5 +21283,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "skov"
@@ -21483,6 +21575,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -21492,10 +21590,10 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr ""
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
@@ -21503,5 +21601,5 @@
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -21517,10 +21615,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "Opret et net af veje."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -21528,10 +21626,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21542,15 +21640,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21561,5 +21659,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
@@ -21567,15 +21665,15 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "Stil et baggrundslag til rådighed, der viser et kortnet"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21588,15 +21686,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "Hjælper med at vektorisere WMS-billeder."
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21606,5 +21704,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21617,15 +21715,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21636,5 +21734,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21644,20 +21742,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "Viser et OpenLayers baggrundsbillede"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importerer sager fra OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21666,5 +21764,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21673,5 +21771,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21680,5 +21778,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21689,10 +21787,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21700,15 +21798,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Tillad andre applikationer at sende kommandoer til JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21718,5 +21816,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21727,10 +21825,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Tilføjer ruteplan-egenskaber"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21739,5 +21837,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21747,16 +21845,31 @@
 "baggrund og anmode om opdateringer."
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "Information om udvidelser"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Tillad tilføjelse af markører/punkter på de nuværende gps-positioner."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Stiller en dialog til redigering af tags i tabelform til rådighed"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21769,15 +21882,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "Laver rækkehuse ud af en enkelt blok."
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21786,5 +21899,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21793,5 +21906,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21800,10 +21913,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21814,5 +21927,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21822,5 +21935,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21831,20 +21944,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Nem download langs et langt sæt af indbyrdes forbundne veje"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21853,5 +21966,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22745,4 +22858,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22750,5 +22907,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "rundkørsel"
@@ -23255,5 +23412,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "beboelse"
@@ -23302,5 +23459,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "service"
@@ -23333,6 +23490,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "konstruktion"
@@ -24491,5 +24648,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "marsk"
@@ -24687,7 +24844,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "cykel"
@@ -24963,8 +25120,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "bane"
@@ -26400,5 +26557,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "terminal"
@@ -27671,32 +27828,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "sport"
@@ -29493,9 +29684,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "grøn"
@@ -31158,5 +31349,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "undergrundsbane"
@@ -31437,5 +31628,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31453,5 +31644,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr ""
@@ -31828,7 +32019,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr ""
@@ -31920,9 +32111,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "services"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31932,5 +32131,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr ""
@@ -31949,7 +32148,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "Jernbaneplatform"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr ""
@@ -31964,5 +32176,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr ""
@@ -31976,5 +32188,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "flodbred"
@@ -31988,5 +32200,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "bæk"
@@ -32000,5 +32212,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "havn"
@@ -32202,14 +32414,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "menneskeskabt"
@@ -32223,5 +32435,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -32283,7 +32495,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr ""
@@ -32306,10 +32518,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr ""
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr ""
@@ -32343,7 +32555,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr ""
@@ -32388,6 +32600,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr ""
@@ -32409,5 +32621,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr ""
@@ -32421,5 +32633,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr ""
@@ -32497,8 +32709,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr ""
@@ -32514,5 +32726,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr ""
@@ -32526,5 +32738,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr ""
@@ -32538,5 +32750,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr ""
@@ -32550,5 +32762,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr ""
@@ -32562,5 +32774,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr ""
@@ -32574,5 +32786,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr ""
@@ -32692,11 +32904,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "kraft"
@@ -32709,5 +32921,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "mole"
@@ -32721,5 +32933,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "rørledning"
@@ -32863,13 +33075,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "rekreation"
@@ -32883,5 +33095,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "marina"
@@ -32977,10 +33189,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr ""
@@ -33090,11 +33302,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr ""
@@ -33532,24 +33744,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr ""
@@ -33581,6 +33793,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr ""
@@ -33641,8 +33853,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "helbred"
@@ -34003,26 +34215,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "butik"
@@ -34094,8 +34306,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hotel"
@@ -34195,9 +34407,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "turisme"
@@ -34285,9 +34497,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "historisk"
@@ -34300,5 +34512,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "stenbrud"
@@ -34312,5 +34524,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "losseplads"
@@ -34332,5 +34544,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "basin"
@@ -34344,5 +34556,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "gårdsplads"
@@ -34365,5 +34577,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr ""
@@ -34377,5 +34589,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "industri"
@@ -34389,5 +34601,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr ""
@@ -34401,5 +34613,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr ""
@@ -34413,5 +34625,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr ""
@@ -34468,7 +34680,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "militær"
@@ -34482,5 +34694,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "kirkegård"
@@ -34493,5 +34705,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "top"
@@ -34506,5 +34718,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "gletsjer"
@@ -34518,5 +34730,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "vulkan"
@@ -34570,8 +34782,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr ""
@@ -34585,5 +34797,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "buskads"
@@ -34597,5 +34809,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "hede"
@@ -34609,5 +34821,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr ""
@@ -34621,5 +34833,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr ""
@@ -34633,5 +34845,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "strand"
@@ -34709,8 +34921,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "rute"
@@ -34799,12 +35011,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "grænse"
@@ -34954,11 +35166,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "sted"
@@ -34972,5 +35184,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -35339,4 +35551,42 @@
 msgstr ""
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Kun op til to områder kan forenes i øjeblikket"
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Forbandt selv-overlappende område"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Indtast værdier for alle konflikter."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Løs konflikter"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Sammenlæg områder: Fjern korte veje"
+
+#~ msgid "Closed Way"
+#~ msgstr "Lukket vej"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr "Fejl: Uventet linje ''{0}'' i bogmærkeliste fra server"
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr ""
+#~ "Fejl: Ulovlig double værdi ''{0}'' i linje ''{1}'' i bogmærkeliste fra "
+#~ "server"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Kunne af sikkerhedsårsager ikke hente bogmærke fra \"{0}\". Undtagelse "
+#~ "var: {1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>Kunne ikke skrive bogmærke.<br>{0}</html>"
+
 #~ msgid "Move"
 #~ msgstr "Flyt"
@@ -35558,7 +35808,4 @@
 #~ msgstr "Løs {0} konflikter i {1} objekter"
 
-#~ msgid "Split way segment"
-#~ msgstr "Opdel vejstykke"
-
 #~ msgid "Degrees Minutes Seconds"
 #~ msgstr "Grader minutter sekunder"
@@ -35578,7 +35825,4 @@
 #~ 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"
@@ -36420,7 +36664,4 @@
 #~ "tags eller et interval, for eksempel tags:1 eller tags:2-5"
 
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Forkert antal parametre for punkt operatør."
-
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
Index: /applications/editors/josm/i18n/po/de.po
===================================================================
--- /applications/editors/josm/i18n/po/de.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/de.po	(revision 23252)
@@ -8,6 +8,6 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
-"PO-Revision-Date: 2010-09-10 18:57+0000\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
+"PO-Revision-Date: 2010-09-14 15:52+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: <de@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -235,5 +235,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -255,5 +254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -275,7 +274,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -400,5 +400,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -425,4 +425,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -430,5 +431,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -463,5 +464,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Information"
@@ -675,8 +676,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -688,5 +689,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Entfernen"
@@ -862,14 +863,14 @@
 msgstr "Programm beenden."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Vollbildanzeige"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Vollbilddarstellung umschalten"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Vollbilddarstellung umschalten"
@@ -912,26 +913,22 @@
 msgstr "Informationen über Wege, Knoten oder Relationen anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Überlappende Flächen verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Sich überlappende Flächen miteinander verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "Bitte mindestens einen geschlossenen Weg zum Vereinigen wählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Momentan können nur maximal zwei Flächen vereinigt werden."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" ist nicht geschlossen und kann deshalb nicht vereinigt werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -944,5 +941,5 @@
 "Die gewählten Wege enthalten Knoten außerhalb des heruntergeladenen Gebietes."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -950,37 +947,67 @@
 msgstr "Dies kann dazu führen, dass Knoten aus Versehen gelöscht werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Möchten Sie wirklich fortfahren?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Bitte abbrechen, falls Sie nicht sicher sind"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Keine Überschneidung gefunden. Es wurde nichts geändert."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Änderungssatz umkehren"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Doppelte Knoten entfernen..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Knoten auf allen Schnittpunkten erstellt"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Wege entfernen, die nicht Teil des inneren Multipolygons sind"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Relationen korrigieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Selbstüberlappende Gebiete verbunden"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Überlappende Gebiete verbunden"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -990,33 +1017,22 @@
 "prüfen Sie, dass keine Fehler entstanden sind."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Werte für alle Konflikte festlegen."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Konflikte auflösen"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Merkmalskonflikte beheben"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Weg {0} in {1} Teile teilen"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Element aus Relationen entfernt"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Flächen verbinden: Kurze Wege entfernen"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Weg geschlossen"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Merkmale von inneren Wegen entfernen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Funktion zum Flächen verbinden"
@@ -1547,12 +1563,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1573,6 +1588,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1607,6 +1622,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Fehler"
@@ -1638,5 +1653,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1750,5 +1765,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Schließen"
@@ -1774,5 +1789,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Nein, abbrechen"
@@ -1804,5 +1819,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -2006,10 +2021,10 @@
 msgstr "Knoten getrennt"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "In {0} Knoten teilen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2426,4 +2441,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2577,17 +2593,17 @@
 msgstr[1] "Virtuellen Knoten zu {0} Wegen hinzufügen und bewegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Elemente verschieben"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Verschieben"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Verschieben rückgängig machen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2600,9 +2616,9 @@
 "Wollen Sie sie wirklich verschieben?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Maustaste loslassen, um Objekte im Rechteck auszuwählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2611,9 +2627,9 @@
 "Knoten vereinigen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Maustaste loslassen, um das Drehen zu stoppen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3120,4 +3136,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3516,5 +3533,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Neuer Wert"
@@ -3594,15 +3610,15 @@
 msgstr "Ungültiger Längenwert ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, 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:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, 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:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3613,5 +3629,5 @@
 "Verzeichnis \"{0}\" kein Verzeichnis ist."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3622,5 +3638,5 @@
 "\"{0}\" kein Verzeichnis ist.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3631,5 +3647,5 @@
 "nicht erstellt werden konnte."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3640,5 +3656,5 @@
 "Einstellungsverzeichnis konnte nicht erstellt werden: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3648,5 +3664,5 @@
 "Standardeinstellungen."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3657,5 +3673,5 @@
 "Standardeinstellungen ersetzt."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3666,5 +3682,5 @@
 "konnte nicht auf Standardwerte zurückgesetzt werden: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3676,5 +3692,5 @@
 "Standardwerten erzeugt.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3684,17 +3700,4 @@
 "Warnung: Initialisierung der Einstellungen fehlgeschlagen. Einstellungsdatei "
 "konnte nicht auf Standardwerte zurückgesetzt werden: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Fehler: Unerwartete Zeile ''{0}'' in der Lesezeichen-Datei ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Fehler: Unzulässiger Wert ''{0}'' vom Typ double in der Zeile ''{1}'' der "
-"Lesezeichen-Datei ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3711,28 +3714,4 @@
 msgid "Could not load preferences from server."
 msgstr "Kann keine Einstellungen vom Server laden."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-"Fehler: Unerwartete Zeile ''{0}'' in der Liste der Lesezeichen vom Server"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-"Fehler: Unzulässiger Gleitkommawert ''{0}'' in der Zeile ''{1}'' der Liste "
-"der Lesezeichen vom Server"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"Die Lesezeichen konnten aus Sicherheitsgründen nicht von ''{0}'' geladen "
-"werden. Die Ausnahme lautet: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4171,5 +4150,27 @@
 msgstr "Geodätisches System UTM"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Fehler beim Erstellen des Speichers: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Fehler: Unerwartete Zeile ''{0}'' in der Lesezeichen-Datei ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Fehler: Unzulässiger Wert ''{0}'' vom Typ double in der Zeile ''{1}'' der "
+"Lesezeichen-Datei ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
@@ -4177,9 +4178,4 @@
 "<html>Lesezeichen konnten nicht von<br>\"{0}\"<br>gelesen werden. Der Fehler "
 "war: {1}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>Konnte Lesezeichen nicht schreiben.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4298,5 +4294,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "Gebäude"
@@ -4476,10 +4472,10 @@
 "verarbeiten."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Benutzername"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4663,8 +4659,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4892,5 +4888,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5462,9 +5458,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5477,9 +5473,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5565,5 +5560,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "Kein"
@@ -5882,5 +5877,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5987,11 +5982,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Hinzufügen"
@@ -6338,10 +6333,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "In Relationsliste auswählen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "Relation in Relationsliste auswählen."
@@ -8055,9 +8050,9 @@
 msgstr "Dieser URL ist keine gültige Änderungssatzanfrage."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Eigenschaften hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -8066,13 +8061,13 @@
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "Ein leerer Wert löscht den Schlüssel."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -8080,10 +8075,10 @@
 msgstr "<unterschiedlich>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Werte ändern?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -8092,5 +8087,5 @@
 msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -8099,77 +8094,86 @@
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Bitte wählen Sie einen Schlüssel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Bitte wählen Sie einen Wert"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 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/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Eigenschaften/Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Eigenschaften der ausgewählten Objekte."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Element von"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr "Position"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Eigenschaften / Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Relation ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Aus der Relation entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Auswahl wirklich aus Relation {0} entfernen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Den gewählten Schlüssel von allen Objekten entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Eigenschaften entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Neues Paar aus Schlüssel und Wert zu allen Objekten hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Den Wert des Schlüssels für alle Objekte bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Eigenschaften der ausgewählten Objekte."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "Relation auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "Relation in Hauptauswahl übernehmen."
@@ -8950,5 +8954,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9612,5 +9616,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11999,13 +12003,13 @@
 msgstr "Benutzerinformationen abrufen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Erweiterte Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Einstellungseinträge direkt setzen. Bitte vorsichtig benutzen!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -12013,19 +12017,30 @@
 msgstr "Suche: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Aktueller Wert ist Standard."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Standardwert ist ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
 "Standardwert momentan unbekannt (Einstellung wurde noch nicht verwendet)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Bitte wählen Sie die zu löschende Zeile."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Ein neues Schlüssel/Wert-Paar hinzufügen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -12033,20 +12048,13 @@
 msgstr "Bitte wählen Sie eine Zeile zum Bearbeiten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Neuer Wert für {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Bitte wählen Sie die zu löschende Zeile."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Ein neues Schlüssel/Wert-Paar hinzufügen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Wert"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12639,5 +12647,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Voreinstellungen laden"
@@ -13148,5 +13156,10 @@
 "Der Eintrag ist ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -13158,10 +13171,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr "Objektvorlagenquelle konnte nicht gelesen werden {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -13174,5 +13187,5 @@
 "[{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -13184,5 +13197,5 @@
 "table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -13194,5 +13207,5 @@
 "</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -13204,9 +13217,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Objektvorlagenmenü sortieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Objektvorlagen"
@@ -15265,5 +15278,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "keine Beschreibung verfügbar"
@@ -15282,5 +15295,10 @@
 msgstr "Die Plugin-Datei \"{0}\" enthält kein Manifest."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "Mehr Info..."
@@ -15748,5 +15766,5 @@
 "''en'' wird benutzt."
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -15858,4 +15876,28 @@
 "nicht aus den Einstellungen geladen werden."
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Einstellungen ändern"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Bilder importieren"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Nicht-georeferenziertes Bild nehmen."
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Fehler bei der Erstellung des entfernten Layers: {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -16227,4 +16269,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr "Wege ausrichten"
@@ -16249,5 +16292,5 @@
 "erzeugen.\n"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr "Bereit!"
@@ -16255,5 +16298,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr "Tipps zum Wegausrichten"
@@ -16829,8 +16872,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "Wasser"
@@ -16891,6 +16934,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "Adresse"
@@ -17398,6 +17441,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Leere Ebene"
@@ -17624,6 +17667,15 @@
 msgstr "Keine GPX-Datenebene gefunden."
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Externe Werkzeuge"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+#, fuzzy
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr "Skripte haben ungültige Daten zurückgelieferte."
 
@@ -17646,5 +17698,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr "Externe Skript in JOSM nutzen"
@@ -17899,13 +17951,17 @@
 "with [irs rectify] in subject."
 msgstr ""
+"Diese Option erzeugt eine IRS-Ausrichtungsebene und einen kleinen Weg "
+"innerhalb. Zuerst muss die WMS-Ebene ausgerichtet werden. Die Ergebnisebene "
+"muss als .osm gespeichert und an Kompza (me@komzpa.net) mit [irs rectify] im "
+"Betreff gesendet werden."
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:70
 msgid "Zoom level was not enough to record an offset precisely"
-msgstr ""
+msgstr "Zoomstufe zur Bestimmung des Versatzes nicht ausreichend"
 
 #. if there are none, create one
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:103
 msgid "IRS Adjustment Layer"
-msgstr ""
+msgstr "IRS-Ausrichtungsebene"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
@@ -18373,5 +18429,5 @@
 msgstr "Sie müssen mindestens zwei Wege auswählen."
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -19167,4 +19223,9 @@
 msgid "Enter weight values"
 msgstr "Gewichtswerte eingeben"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Neuer Wert für {0}"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
@@ -21217,5 +21278,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "Fläche"
@@ -21357,140 +21418,146 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "{0} {1}% der GPS-Spur"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr "Zeigt die aktuelle Position im Video"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr "Video importieren"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr "Ein Video mit dieser GPS-Spur synchronisieren"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr "Video entfernen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr "Aktuelles Video aus Ebene entfernen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr "Abspielen/Pause"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Abspielen / Pause"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr "Videoabspielen starten/anhalten"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
 msgstr "rückwärts"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr "n Sekunden zurückspringen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr "Anspringen"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Springe vor"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr "Auf eingestellte GPS-Zeit springen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr "Bitte GPS-Timecode eingeben"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr "vorwärts"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Vorwärts"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr "n Sekunden vorwärtsspringen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr "schneller"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Schneller"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr "schneller abspielen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr "langsamer"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Langsamer"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr "langsamer abspielen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+#, fuzzy
+msgid "Loop"
 msgstr "Schleife"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr "Schleife von n Sekunden um aktuelle Position"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr "Zentriert halten"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr "Dem Videosymbol automatisch folgen"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr "Untertitel"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr "Untertitel im Video anzeigen"
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr "Sprungweite"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 msgid "Set the length of a jump"
 msgstr "Weite eines Spungs festlegen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr "Im Video x ms springen"
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr "Schleifenlänge"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr "Länge um einen Schleifenpunkt festlegen"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr "Kein Deinterlacing"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr "Deinterlacing mittels Zeilenverdopplung"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr "Deinterlacing mit linearer Interpolation"
@@ -21508,4 +21575,8 @@
 msgid "play"
 msgstr "Wiedergabe"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
+msgstr "Schleife"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
@@ -21622,6 +21693,12 @@
 "Wegen."
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Suchbegriff eingeben"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr "Wegpunkt zum Bewegen der Karte wählen"
@@ -21650,5 +21727,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Menüname"
@@ -21659,6 +21736,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr "Ebenen abfragen"
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Sporteinrichtungen"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21692,5 +21770,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "WMS-URL"
@@ -21829,5 +21907,5 @@
 "nicht identisch. Das kann zu falschen Koordinaten führen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21836,19 +21914,19 @@
 "ungültiges Format hat"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr "(deaktiviert)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-Ebene ({0}): Automatisches Laden mit Zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-Ebene ({0}): Laden mit Zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -21863,17 +21941,17 @@
 "heruntergeladen werden?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "Ja, Kacheln herunterladen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "Ungültige URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Sichtbare Kacheln laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21882,63 +21960,63 @@
 "die Auflösung"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Auflösung ändern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Fehlerhafte Kacheln neu laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Alphakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "WMS-Ebene in Datei speichern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "WMS-Ebene speichern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "WMS-Ebene aus Datei laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "WMS-Ebene laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "WMS-Datei-Version nicht unterstützt; gefunden {0}, erwartet {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Dateiformatfehler"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Fehler beim Laden der Datei"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "WMS-Lesezeichen erstellen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Automatisches Laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr "Fernsteuerung konnte nicht initialisiert werden."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr "Fernsteuerplugin ist nicht kompatibel mit {0}."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -21950,5 +22028,5 @@
 "Die Plugins sollten aktualisiert werden."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -21962,73 +22040,84 @@
 "melden."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr "{0}: Problem mit Fernbedienung"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 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"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Einstellungen für WMS-Plugin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Liste der WMS-Server ändern, die im WMS Plugin-Menü angezeigt werden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr "WMS-URL hinzufügen"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "Ausgewählte Standardwerte kopieren"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "Bitte wählen Sie mindestens eine Zeile, die kopiert werden soll."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "Herunterladeprogramm:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "Kacheln überlappen"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "Ost-West (%):"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "Nord-Süd (%):"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr "Simultane Verbindungen"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr "Erlaube Fernsteuerung (erfordert remotecontrol-Plugin)"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Zoomen"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Menüname (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "WMS-URL (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr "WMS-URL hinzufügen"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "Ausgewählte Standardwerte kopieren"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "Bitte wählen Sie mindestens eine Zeile, die kopiert werden soll."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "Herunterladeprogramm:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "Kacheln überlappen"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "Ost-West (%):"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "Nord-Süd (%):"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr "Simultane Verbindungen"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr "Erlaube Fernsteuerung (erfordert remotecontrol-Plugin)"
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr "Die Fernsteuerung soll eine WMS-Ebene von folgender URL laden:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Entfernen"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -22098,5 +22187,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "Forst"
@@ -22390,6 +22479,12 @@
 msgstr "Sättigung:"
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -22402,10 +22497,10 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr "Erleichtert das Zeichnen von Gebäuden"
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
@@ -22413,5 +22508,5 @@
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -22428,10 +22523,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "Erzeugt ein Wegegitter."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -22441,10 +22536,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Ermöglicht den direkten Import verschiedener Dateiformate in JOSM."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -22455,15 +22550,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr "Lädt OSM-Daten entlang eines Weges herunter"
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "Wege mit einem Versatz duplizieren."
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -22474,5 +22569,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
@@ -22480,15 +22575,15 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr "Visualisiert Routeninformationen als Routengraph."
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "Erstellt eine Hintergrundebene, die ein Kartennetz anzeigt"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -22501,15 +22596,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
-msgstr ""
+msgstr "Eine Hilfe zum Ausrichten von IRS-Satellitenbildern."
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "Hilfe beim Vektorisieren von WMS-Bildern."
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -22519,5 +22614,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -22530,15 +22625,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "Fügt Abbiegeverbote nach links für 4 oder 5 ausgewählte Wege hinzu"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr "Ein Gebiet einfach in ein Multipolygon umwandeln."
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -22549,5 +22644,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -22560,20 +22655,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr "erweiterte Optionen um Öffnungszeiten zu bearbeiten"
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "Zeigt ein OpenLayers-Hintergrundbild"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importiert Berichte von OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -22583,5 +22678,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -22590,5 +22685,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -22599,5 +22694,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -22608,10 +22703,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Das großartige Plastic-Design von JGoodies."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -22621,15 +22716,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Erlaubt anderen Programmen, Kommandos an JOSM zu senden."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr "Plugin zum Umkehren von Änderungssätzen"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -22643,5 +22738,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -22652,10 +22747,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Bietet Routenführungsmöglichkeiten."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -22667,5 +22762,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -22675,16 +22770,32 @@
 "Hintergrund laden und Aktualisierungen veranlassen."
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+#, fuzzy
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr "Seezeichen für OpenSeaMap erstellen und bearbeiten"
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "Plugin-Information"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Erlaubt Markierungen/Knoten an der aktuellen GPS-Position einzufügen."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Öffnet einen Dialog, um Merkmale in einer Tabelle zu bearbeiten."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22697,15 +22808,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "Erstellt Reihenhäuser aus einem Häuserblock."
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr "Seezeichen für OpenSeaMap erstellen und bearbeiten"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22716,5 +22827,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22725,5 +22836,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22734,10 +22845,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr "Erlaubt es Objekte der OSM-Datenbank wiederherzustellen"
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22749,5 +22860,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22760,5 +22871,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22770,10 +22881,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Leichtes Herunterladen entlang einer langen Reihe verbundener Wege"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
@@ -22781,10 +22892,10 @@
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Eine Reihe von nichtverzweigenden verbundenen Wegen auswählen"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22795,5 +22906,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -23689,4 +23800,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -23694,5 +23849,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "Kreisverkehr"
@@ -24199,5 +24354,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "Ortsstraße"
@@ -24246,5 +24401,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "Service"
@@ -24277,6 +24432,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "Baustelle"
@@ -25435,5 +25590,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "Marsch"
@@ -25631,7 +25786,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "Fahrrad"
@@ -25907,8 +26062,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "Eisenbahn"
@@ -27222,5 +27377,5 @@
 #: build/trans_presets.java:1674
 msgid "Edit Terminal Gate"
-msgstr "Terminal-Gate bearbeiten"
+msgstr "Flugsteig/Gate bearbeiten"
 
 #. group "Travel"
@@ -27344,5 +27499,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "Terminal"
@@ -28615,32 +28770,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "Sport"
@@ -30437,9 +30626,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "grün"
@@ -32102,5 +32291,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "U-Bahn"
@@ -32381,5 +32570,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32397,5 +32586,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "veraltet"
@@ -32772,7 +32961,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "Weg"
@@ -32864,9 +33053,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "Service"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32876,5 +33073,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "Furt"
@@ -32893,7 +33090,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "Weg"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "Wendekreis"
@@ -32908,5 +33118,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr "Notfallrettungspunkt"
@@ -32920,5 +33130,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "Flussufer"
@@ -32932,5 +33142,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "Fluss"
@@ -32944,5 +33154,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "Dock"
@@ -33146,14 +33356,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "Zivilisationsbauten"
@@ -33167,5 +33377,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr "Stromschnelle"
@@ -33227,7 +33437,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "Eisenbahnpunkt"
@@ -33250,10 +33460,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "Andere Bahnen"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "Eisenbahn-Überlagerung"
@@ -33287,7 +33497,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "Alte Eisenbahn"
@@ -33332,6 +33542,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "Rollweg"
@@ -33353,5 +33563,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "Rollweg (dunkel)"
@@ -33365,5 +33575,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "Rollweg (hell)"
@@ -33441,8 +33651,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "Luftweg"
@@ -33458,5 +33668,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "Einfache Piste"
@@ -33470,5 +33680,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "Mittelschwere Piste"
@@ -33482,5 +33692,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "Fortgeschrittenenpiste"
@@ -33494,5 +33704,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr "Expertenpiste"
@@ -33506,5 +33716,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "freie Piste"
@@ -33518,5 +33728,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "Anfängerpiste"
@@ -33636,11 +33846,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "Strom"
@@ -33653,5 +33863,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "Anlegestelle (Pier)"
@@ -33665,5 +33875,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "Pipeline"
@@ -33807,13 +34017,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "Freizeit"
@@ -33827,5 +34037,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "Jachthafen"
@@ -33921,10 +34131,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "Einrichtungen"
@@ -34034,11 +34244,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "Verkehrseinrichtungen"
@@ -34476,24 +34686,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "Einrichtungen (hell)"
@@ -34525,6 +34735,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "Wasser (hell)"
@@ -34585,8 +34795,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "Gesundheit"
@@ -34947,26 +35157,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "Geschäft"
@@ -35038,8 +35248,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "Hotel"
@@ -35139,9 +35349,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "Tourismus"
@@ -35229,9 +35439,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "Historisch"
@@ -35244,5 +35454,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "Steinbruch"
@@ -35256,5 +35466,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "Mülldeponie"
@@ -35276,5 +35486,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "Wasserbecken"
@@ -35288,5 +35498,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "Farmland"
@@ -35309,5 +35519,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "Einkaufsbereich"
@@ -35321,5 +35531,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "Industriegebiet"
@@ -35333,5 +35543,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "Baulücke"
@@ -35345,5 +35555,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "Bauland"
@@ -35357,5 +35567,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "Eisenbahnland"
@@ -35412,7 +35622,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "Militär"
@@ -35426,5 +35636,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "Friedhof"
@@ -35437,5 +35647,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "Berggipfel"
@@ -35450,5 +35660,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "Gletscher"
@@ -35462,5 +35672,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "Vulkan"
@@ -35514,8 +35724,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "Natur"
@@ -35529,5 +35739,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "Buschland"
@@ -35541,5 +35751,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "Heide"
@@ -35553,5 +35763,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "Waldfläche"
@@ -35565,5 +35775,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "Schlick & Moor"
@@ -35577,5 +35787,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "Strand"
@@ -35653,8 +35863,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "Route"
@@ -35743,12 +35953,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "Grenze"
@@ -35898,11 +36108,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "Ort"
@@ -35916,5 +36126,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr "Tiger-Daten"
@@ -36282,4 +36492,61 @@
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 - Italy"
+
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Momentan können nur maximal zwei Flächen vereinigt werden."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Selbstüberlappende Gebiete verbunden"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Werte für alle Konflikte festlegen."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Konflikte auflösen"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Flächen verbinden: Kurze Wege entfernen"
+
+#~ msgid "Closed Way"
+#~ msgstr "Weg geschlossen"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr ""
+#~ "Fehler: Unerwartete Zeile ''{0}'' in der Liste der Lesezeichen vom Server"
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr ""
+#~ "Fehler: Unzulässiger Gleitkommawert ''{0}'' in der Zeile ''{1}'' der "
+#~ "Liste der Lesezeichen vom Server"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Die Lesezeichen konnten aus Sicherheitsgründen nicht von ''{0}'' geladen "
+#~ "werden. Die Ausnahme lautet: {1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>Konnte Lesezeichen nicht schreiben.<br>{0}</html>"
+
+#~ msgid "play/pause"
+#~ msgstr "Abspielen/Pause"
+
+#~ msgid "jump"
+#~ msgstr "Anspringen"
+
+#~ msgid "forward"
+#~ msgstr "vorwärts"
+
+#~ msgid "faster"
+#~ msgstr "schneller"
+
+#~ msgid "slower"
+#~ msgstr "langsamer"
+
+#~ msgid "Get Layers"
+#~ msgstr "Ebenen abfragen"
 
 #~ msgid "Create non-audio markers when reading GPX."
Index: /applications/editors/josm/i18n/po/el.po
===================================================================
--- /applications/editors/josm/i18n/po/el.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/el.po	(revision 23252)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
-"PO-Revision-Date: 2010-09-02 21:03+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
+"PO-Revision-Date: 2010-09-15 14:41+0000\n"
+"Last-Translator: aitolos <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -228,5 +228,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -248,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -268,7 +267,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -389,5 +389,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -414,4 +414,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -419,5 +420,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -452,5 +453,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Πληροφορίες"
@@ -662,8 +663,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -675,5 +676,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Διαγραφή"
@@ -850,14 +851,14 @@
 msgstr "Έξοδος από την εφαρμογή"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Προβολή Πλήρους Οθόνης"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Εναλλαγή προβολής πλήρους οθόνης"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Εναλλαγή προβολής πλήρους οθόνης"
@@ -902,26 +903,22 @@
 "Εμφανίζει πληροφορίες αντικειμένου σχετικα με διαδρομές, κόμβους ή σχέσεις."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Ένωση αλληλοκαλυπτόμενων Περιοχών"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Ενώνει περιοχές που αλληλοκαλύπτονται."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Μόνο μέχρι δυο περιοχές μπορούν να ενωθούν μέχρι στιγμής."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "Η \"{0}\" δεν είναι κλειστή και γι'αυτό δεν μπορεί να ενωθεί."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -936,5 +933,5 @@
 "ληφθεί."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -942,37 +939,67 @@
 msgstr "Αυτό μπορεί να έχει επακόλουθο σβήσιμο κόμβων κατα λάθος."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Σίγουρα να συνεχίσω;"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Παρακαλώ ακυρώστε αν δεν είστε σίγουροι"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Δεν βρέθηκε διασταύρωση. Τίποτα δεν αλλάχθηκε."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Ποτά"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Αφαίρεση διπλών κόμβων..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Προστέθηκε κόμβος σε όλες τις διασταυρώσεις"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Δίορθωση σχέσεων"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -980,33 +1007,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Εισάγετε τιμές για όλες τισ διενέξεις."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Επίλυση διενέξεων"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Διόρθωση συγκρούσεων ετικετών"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Διαίρεση διαδρομής {0} σε {1} μέρη"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Αφαιρέθηκε στοιχείο από Σχέσεις"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Λειτουργία ένωσης περιοχών"
@@ -1199,9 +1215,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
 msgid "New Layer"
-msgstr ""
+msgstr "Νέο Επίπεδο"
 
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map layer."
-msgstr ""
+msgstr "Δημιουργία ενός νέου επιπέδου χάρτη"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:47
@@ -1512,12 +1528,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1538,6 +1553,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1572,6 +1587,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Σφάλμα"
@@ -1603,5 +1618,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1714,5 +1729,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Κλείσιμο"
@@ -1738,5 +1753,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Όχι, ακύρωση"
@@ -1768,5 +1783,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1958,10 +1973,10 @@
 msgstr "Αποσυνδεδεμένος Κόμβος"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Αντιγραφή σε {0} κόμβους"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2073,5 +2088,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
 msgid "Upload all changes in the active data layer to the OSM server"
-msgstr ""
+msgstr "Αποστολή όλων των αλλαγών του ενεργού επιπέδου στον διακομιστή OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
@@ -2362,4 +2377,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2506,17 +2522,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Μετακίνηση στοιχείων"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Αναίρεση μετακίνησης"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2529,5 +2545,5 @@
 "Σίγουρα να μετακινηθούν;"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2535,5 +2551,5 @@
 "τετράγωνο"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2542,9 +2558,9 @@
 "συγχώνευση με το πλησιέστερο κόμβο."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Αφήστε το πλήκτρο του ποντικιού για να σταματήσετε την περιστροφή"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3001,4 +3017,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3383,5 +3400,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Καινούργια τιμή"
@@ -3454,15 +3470,15 @@
 msgstr "Μη αποδεκτή τιμή Γ/Μήκους \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3471,5 +3487,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3478,5 +3494,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3485,5 +3501,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3492,5 +3508,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3498,5 +3514,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3505,5 +3521,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3512,5 +3528,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3519,20 +3535,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
 "Warning: Failed to initialize preferences.Failed to reset preference file to "
 "default: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 msgstr ""
 
@@ -3550,23 +3555,4 @@
 msgid "Could not load preferences from server."
 msgstr "Αδυναμία φόρτωσης προτιμήσεων από διακομηστή"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -3974,12 +3960,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Σφάλμα κατά την δημιουργία  καταλόγου cache: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, 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:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
 msgstr ""
 
@@ -4099,5 +4100,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "κτίριο"
@@ -4269,10 +4270,10 @@
 msgstr "Άν δοθεί, επαναφορά των ρυθμίσεων αντί για ανάγνωση τους."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4445,8 +4446,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4664,5 +4665,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5196,9 +5197,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5211,9 +5212,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5299,5 +5299,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "καμοία"
@@ -5585,5 +5585,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5683,11 +5683,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Προσθήκη"
@@ -6032,10 +6032,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr ""
@@ -7687,9 +7687,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Προσθήκη Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7698,13 +7698,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7712,10 +7712,10 @@
 msgstr "<διαφορετικά>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Αλλαγή τιμών;"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7724,5 +7724,5 @@
 msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7731,78 +7731,87 @@
 msgstr[1] "Αυτό θα αλλάξει εώς {0} αντικείμενα."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Παρακαλώ επιλέξτε κλειδί"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Παρακαλώ επιλέξτε μια τιμή"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Παρακαλώ επιλέξτε τα αντικείμενα των οποίων τις ιδιότητες θέλετε να αλλάξετε."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Ιδιότητες/Υπαγωγές"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Ιδιότητες επιλεγμένων αντικειμένων."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Μέλος του"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Ιδιότητες / Υπαγωγές"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Αλλαγή σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Διαγραφή από σχέση"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Διαγραφή Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Προσθήκη νέου ζεύγους κλειδιού/τιμής σε όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Ιδιότητες επιλεγμένων αντικειμένων."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr ""
@@ -8533,5 +8542,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9119,5 +9128,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11270,13 +11279,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Προχωρημένες προτιμήσεις"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Απ' ευθείας Ρύθμιση Προτιμήσεων. Χρησιμοποιήστε με προσοχή!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11284,14 +11293,14 @@
 msgstr "Αναζήτηση: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Η τρέχουσα τιμή είναι η προεπιλεγμένη."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Η προεπιλεγμένη τιμή είναι \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
@@ -11299,5 +11308,16 @@
 "χρησιμοποιηθεί ακόμα)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Παρακαλώ επιλέξτε την γραμμή για διαγραφή."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Εισάγεται ένα νέο ζεύγος κλειδιού/τιμής"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11305,20 +11325,13 @@
 msgstr "Παρακαλώ επιλέξτε την γραμμή για επεξεργασία."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Νέα τιμή για {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Παρακαλώ επιλέξτε την γραμμή για διαγραφή."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Εισάγεται ένα νέο ζεύγος κλειδιού/τιμής"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Τιμή"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -11873,5 +11886,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Ενεργοποίηση ενσωματωμένων προεπιλογών"
@@ -12340,5 +12353,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12348,10 +12366,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12361,5 +12379,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12368,5 +12386,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12375,5 +12393,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12382,9 +12400,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Ταξινόμηση μενού προεπιλογών"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Προεπιλογές Ετικετών"
@@ -12833,10 +12851,10 @@
 #, java-format
 msgid "Preset group {1} / {0}"
-msgstr ""
+msgstr "Προεπιλογές ομάδας {1} / {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
 #, java-format
 msgid "Preset group {0}"
-msgstr ""
+msgstr "Προεπιλογές ομάδας {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12846,5 +12864,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
 msgid "Show preset search dialog"
-msgstr ""
+msgstr "Εμφάνιση διαλόγου αναζήτησης προεπιλογών"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
@@ -14256,5 +14274,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "δεν υπάρχει περιγραφή"
@@ -14271,5 +14289,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr ""
@@ -14638,5 +14661,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -14733,4 +14756,28 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Αλλαγή ιδιοτήτων"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Εισαγωγή εικόνων"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Εισαγμένες Εικόνες"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Σφάλμα κατά την φόρτωση της σελίδας {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15089,4 +15136,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15107,5 +15155,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15113,5 +15161,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -15596,8 +15644,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "νερό"
@@ -15658,6 +15706,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "διεύθυνση"
@@ -16126,6 +16174,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Άδειο επίπεδο"
@@ -16346,6 +16394,14 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Εσωτερικό Σφάλμα Διακομιστή"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16368,5 +16424,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17083,5 +17139,5 @@
 msgstr ""
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -17856,4 +17912,9 @@
 msgstr ""
 
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Νέα τιμή για {0}"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
@@ -18936,5 +18997,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70
 msgid "Select if the data should be added into a new layer"
-msgstr ""
+msgstr "Επιλέξτε αν τα δεδομένα θα προστεθούν σε ένα νέο επίπεδο"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88
@@ -19792,5 +19853,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr ""
@@ -19826,5 +19887,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:43
 msgid "Untagged and unconnected nodes"
-msgstr "Κόμβοι ασύνδετοι και χςρίς ετικέτες"
+msgstr "Κόμβοι ασύνδετοι και χωρίς ετικέτες"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:44
@@ -19926,140 +19987,145 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Αναπαραγωγή/παύση"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Πίσω"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Άλμα μπροστά"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Εμπρός"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Πιο γρήγορα"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Πιο αργά"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20076,4 +20142,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20170,6 +20240,11 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+msgid "Enter search expression here.."
+msgstr ""
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20197,5 +20272,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Όνομα μενού"
@@ -20206,6 +20281,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Χώροι Άθλησης"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20236,5 +20312,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "WMS URL"
@@ -20366,24 +20442,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20394,17 +20470,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Λήψη εμφανών πλακιδίων"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20412,63 +20488,63 @@
 "Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Αλλαγή ανάλυσης"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Ανανέωση λανθασμένων πλακιδίων"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Κανάλι άλφα"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Αποθ'ηκευση επιπέδου WMS σε αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Αποθήκευση επιπέδου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Φόρτωση επιπέδου WMS από αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "Φόρτωση επιπέδου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Μη υποστηριζόμενη έκδοση αρχείου WMS΄ βρέθηκε {0}, αναμενόταν {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Σφάλμα μορφής αρχείου"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Σφάλμα φόρτωσης αρχείου"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Αυτόματη λήψη"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20477,5 +20553,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20485,22 +20561,22 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Άνοιγμα ενός κενού επιπέδου WMS για φόρτωση δεδομένων από ένα αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Προτιμήσεις πρόσθετου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
@@ -20508,52 +20584,63 @@
 "πρόσθετου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "Επικάλυψη πλακιδίων"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Ζουμ"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Όνομα Μενού (Προκαθορισμένο)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "WMS URL (Προκαθορισμένο)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "Επικάλυψη πλακιδίων"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Αφαίρεση"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20618,5 +20705,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "δάσος"
@@ -20910,6 +20997,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -20919,15 +21012,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr ""
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -20939,10 +21032,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -20950,10 +21043,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Επιτρέπει την εισαγωγή διαφόρων τύπων αρχείων απ' ευθείας στο JOSM."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -20962,15 +21055,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -20979,20 +21072,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21002,15 +21095,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21018,5 +21111,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21026,15 +21119,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21043,5 +21136,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21051,20 +21144,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Εισάγει προβλήματα από OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21072,5 +21165,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21078,5 +21171,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21085,5 +21178,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21092,10 +21185,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21103,15 +21196,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Επιτρέπει άλλες εφαρμογές να στέλνουν εντολές στο JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21121,5 +21214,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21128,10 +21221,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Παρέχει δυνατότητες δρομολόγησης."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21140,5 +21233,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21146,16 +21239,30 @@
 msgstr ""
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+msgid "Plugin for Seamap Editor"
+msgstr ""
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21165,15 +21272,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21182,5 +21289,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21189,5 +21296,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21196,10 +21303,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21208,5 +21315,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21216,5 +21323,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21226,20 +21333,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21248,5 +21355,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22140,4 +22247,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22145,5 +22296,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "κυκλικός κόμβος"
@@ -22650,5 +22801,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "Οικιστική"
@@ -22697,5 +22848,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr ""
@@ -22728,6 +22879,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "υπό κατασκευή"
@@ -23886,5 +24037,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "έλος"
@@ -24082,7 +24233,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "ποδήλατο"
@@ -24358,8 +24509,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr ""
@@ -25795,5 +25946,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr ""
@@ -27066,32 +27217,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "άθληση"
@@ -28888,9 +29073,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "πράσινο"
@@ -30553,5 +30738,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "υπόγειος"
@@ -30832,5 +31017,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -30848,5 +31033,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "παρωχημένο"
@@ -31223,7 +31408,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr ""
@@ -31315,9 +31500,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr ""
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31327,5 +31520,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr ""
@@ -31344,7 +31537,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "Οδός ταχείας κυκλοφορίας"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr ""
@@ -31359,5 +31565,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr ""
@@ -31371,5 +31577,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "όχθη ποταμού"
@@ -31383,5 +31589,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "υδατόρρευμα"
@@ -31395,5 +31601,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "προβλήτα"
@@ -31597,14 +31803,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr ""
@@ -31618,5 +31824,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -31678,7 +31884,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr ""
@@ -31701,10 +31907,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr ""
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr ""
@@ -31738,7 +31944,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr ""
@@ -31783,6 +31989,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr ""
@@ -31804,5 +32010,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr ""
@@ -31816,5 +32022,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr ""
@@ -31892,8 +32098,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr ""
@@ -31909,5 +32115,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "πίστα εύκολη"
@@ -31921,5 +32127,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "πίστα μεσαία"
@@ -31933,5 +32139,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "πίστα προχορημένη"
@@ -31945,5 +32151,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr ""
@@ -31957,5 +32163,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr ""
@@ -31969,5 +32175,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "πιστα αρχαρίων"
@@ -32087,11 +32293,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr ""
@@ -32104,5 +32310,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "προβλήτα"
@@ -32116,5 +32322,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "αγωγός"
@@ -32258,13 +32464,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "αναψυχή"
@@ -32278,5 +32484,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr ""
@@ -32372,10 +32578,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr ""
@@ -32485,11 +32691,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr ""
@@ -32927,24 +33133,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr ""
@@ -32976,6 +33182,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr ""
@@ -33036,8 +33242,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "υγεία"
@@ -33398,26 +33604,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "κατάστημα"
@@ -33489,8 +33695,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "ξενοδοχείο"
@@ -33590,9 +33796,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "τουρισμός"
@@ -33680,9 +33886,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "ιστορικό"
@@ -33695,5 +33901,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "λατομείο"
@@ -33707,5 +33913,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "Χ.Υ.Τ.Α."
@@ -33727,5 +33933,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "λεκάνη"
@@ -33739,5 +33945,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr ""
@@ -33760,5 +33966,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr ""
@@ -33772,5 +33978,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "βιομηχανική"
@@ -33784,5 +33990,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr ""
@@ -33796,5 +34002,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr ""
@@ -33808,5 +34014,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr ""
@@ -33863,7 +34069,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "στρατιωτική"
@@ -33877,5 +34083,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "κοιμητήριο"
@@ -33888,5 +34094,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "κορυφή"
@@ -33901,5 +34107,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "παγετώνας"
@@ -33913,5 +34119,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "ηφαίστειο"
@@ -33965,8 +34171,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr ""
@@ -33980,5 +34186,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr ""
@@ -33992,5 +34198,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr ""
@@ -34004,5 +34210,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr ""
@@ -34016,5 +34222,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "λάσπη"
@@ -34028,5 +34234,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "παραλία"
@@ -34104,8 +34310,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "διαδρομή"
@@ -34194,12 +34400,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "όριο"
@@ -34349,11 +34555,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr ""
@@ -34367,5 +34573,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -34734,4 +34940,13 @@
 msgstr ""
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Μόνο μέχρι δυο περιοχές μπορούν να ενωθούν μέχρι στιγμής."
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Εισάγετε τιμές για όλες τισ διενέξεις."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Επίλυση διενέξεων"
+
 #~ msgid ""
 #~ "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -34850,7 +35065,4 @@
 #~ msgid "Open in Browser"
 #~ msgstr "Άνοιγμα σε Φυλλομετρητή"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Σφάλμα κατά την φόρτωση της σελίδας {0}"
 
 #~ msgid "File not found"
Index: /applications/editors/josm/i18n/po/en_AU.po
===================================================================
--- /applications/editors/josm/i18n/po/en_AU.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/en_AU.po	(revision 23252)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
 "PO-Revision-Date: 2010-06-15 17:47+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:53+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -234,5 +234,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -254,5 +253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -274,7 +273,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -397,5 +397,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -422,4 +422,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -427,5 +428,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -460,5 +461,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Information"
@@ -672,8 +673,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -685,5 +686,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Delete"
@@ -859,14 +860,14 @@
 msgstr "Exit the application."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Fullscreen View"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Toggle fullscreen view"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Toggle Fullscreen view"
@@ -909,26 +910,22 @@
 msgstr "Display object information about OSM nodes, ways, or relations."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Join overlapping Areas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Joins areas that overlap each other"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "Please select at least one closed way that should be joined."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Only up to two areas can be joined at the moment."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" is not closed and therefore cannot be joined."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -939,5 +936,5 @@
 msgstr[1] "The selected ways have nodes outside of the downloaded data region."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -945,37 +942,67 @@
 msgstr "This can lead to nodes being deleted accidentally."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Are you really sure to continue?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Please abort if you are not sure"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "No intersection found. Nothing was changed."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Creating changeset..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Removing duplicate nodes..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Added node on all intersections"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Delete Ways that are not part of an inner multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Fix relations"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Joined self-overlapping area"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Joined overlapping areas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -985,33 +1012,22 @@
 "verify no errors have been introduced."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Enter values for all conflicts."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Solve Conflicts"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Fix tag conflicts"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Split way {0} into {1} parts"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Removed Element from Relations"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Join Areas: Remove Short Ways"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Closed Way"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Remove tags from inner ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Join Areas Function"
@@ -1531,12 +1547,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1557,6 +1572,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1591,6 +1606,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Error"
@@ -1622,5 +1637,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1734,5 +1749,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Close"
@@ -1758,5 +1773,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "No, abort"
@@ -1788,5 +1803,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1983,10 +1998,10 @@
 msgstr "Unglued Node"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Dupe into {0} nodes"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2388,4 +2403,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2536,17 +2552,17 @@
 msgstr[1] "Add and move a virtual new node to {0} ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Move elements"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Move them"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Undo move"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2559,9 +2575,9 @@
 "Really move them?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Release the mouse button to select the objects in the rectangle."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2569,9 +2585,9 @@
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Release the mouse button to stop rotating."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3054,4 +3070,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3445,5 +3462,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "New value"
@@ -3516,15 +3532,15 @@
 msgstr "Illegal longitude value ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, 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:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Malformed config file at lines {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3535,5 +3551,5 @@
 "not a directory."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3544,5 +3560,5 @@
 "not a directory.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3553,5 +3569,5 @@
 "preference directory: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3562,5 +3578,5 @@
 "preference directory: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3569,5 +3585,5 @@
 "Warning: Missing preference file ''{0}''. Creating a default preference file."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3578,5 +3594,5 @@
 "file."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3587,5 +3603,5 @@
 "to default: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3596,5 +3612,5 @@
 "<br> and creating a new default preference file.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3604,16 +3620,4 @@
 "Warning: Failed to initialise preferences.Failed to reset preference file to "
 "default: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3630,27 +3634,4 @@
 msgid "Could not load preferences from server."
 msgstr "Could not load preferences from server."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr "Error: Unexpected line ''{0}'' in bookmark list from server"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4072,14 +4053,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Error creating cache directory: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>Could not write bookmark.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4198,5 +4195,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "building"
@@ -4372,10 +4369,10 @@
 msgstr "If specified, reset the configuration instead of reading it."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Username"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4552,8 +4549,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4780,5 +4777,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5338,9 +5335,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5353,9 +5350,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5441,5 +5437,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "none"
@@ -5745,5 +5741,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5847,11 +5843,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Add"
@@ -6196,10 +6192,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "Select in relation list"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "Select relation in relation list."
@@ -7892,9 +7888,9 @@
 msgstr "This changeset query URL is invalid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Add Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7903,13 +7899,13 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "An empty value deletes the tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7917,10 +7913,10 @@
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Change values?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7929,5 +7925,5 @@
 msgstr[1] "Change properties of up to {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7936,77 +7932,86 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Please select a key"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Please select a value"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 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/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Properties/Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Properties for selected objects."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Member Of"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Properties: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Properties / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Change relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Delete from relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Really delete selection from relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Delete the selected key in all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Delete Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Add a new key/value pair to all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edit the value of the selected key for all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Properties for selected objects."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "Select relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "Select relation in main selection."
@@ -8770,5 +8775,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9412,5 +9417,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11730,13 +11735,13 @@
 msgstr "Retrieving user info..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Advanced Preferences"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Setting Preference entries directly. Use with caution!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11744,18 +11749,29 @@
 msgstr "Search: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Current value is default."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Default value is ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr "Default value currently unknown (setting has not been used yet)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Please select the row to delete."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Enter a new key/value pair"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11763,20 +11779,13 @@
 msgstr "Please select the row to edit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "New value for {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Please select the row to delete."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Enter a new key/value pair"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Value"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12350,5 +12359,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Enable built-in defaults"
@@ -12850,5 +12859,10 @@
 msgstr "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Could not read tagging preset source: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12858,10 +12872,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12871,5 +12885,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12878,5 +12892,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12885,5 +12899,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12892,9 +12906,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Sort presets menu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Tagging Presets"
@@ -14891,5 +14905,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "no description available"
@@ -14908,5 +14922,10 @@
 msgstr "The plug-in file ''{0}'' does not include a Manifest."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "More info..."
@@ -15351,5 +15370,5 @@
 "''{0}''. Using default code ''en''."
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -15457,4 +15476,28 @@
 "from preferences."
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Change Properties"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Import images"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Grab non-georeferenced image"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Error creating cache directory: {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15817,4 +15860,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15835,5 +15879,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15841,5 +15885,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -16337,8 +16381,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "water"
@@ -16399,6 +16443,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "address"
@@ -16896,6 +16940,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Blank Layer"
@@ -17118,6 +17162,14 @@
 msgstr "No GPX data layer found."
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Internal Server Error"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -17140,5 +17192,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17853,5 +17905,5 @@
 msgstr "You must select at least two ways."
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -18636,4 +18688,9 @@
 msgstr "Enter weight values"
 
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "New value for {0}"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
@@ -20586,5 +20643,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "area"
@@ -20720,140 +20777,145 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Play/Pause"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Back"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Jump forwards"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Forwards"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Faster"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Slower"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20870,4 +20932,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20976,6 +21042,12 @@
 msgstr "Node ''{0}'' is a junction with more than 2 connected ways."
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Enter a search expression"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -21003,5 +21075,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Menu Name"
@@ -21012,6 +21084,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Sport Facilities"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21042,5 +21115,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "WMS URL"
@@ -21180,24 +21253,24 @@
 "This may lead to wrong coordinates."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr "(deactivated)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS layer ({0}), automatically downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS layer ({0}), downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -21212,17 +21285,17 @@
 "tiles anyway?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "Yes, fetch images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "Invalid URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Download visible tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21230,63 +21303,63 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Reload erroneous tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Save WMS layer to file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Save WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Load WMS layer from file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "Load WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Unsupported WMS file version; found {0}, expected {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "File Format Error"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Error loading file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "Set WMS Bookmark"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Automatic downloading"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -21295,5 +21368,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -21303,73 +21376,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Open a blank WMS layer to load data from a file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "WMS Plug-in Preferences"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Modify list of WMS servers displayed in the WMS plug-in menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "Copy Selected Default(s)"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "Please select at least one row to copy."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "Downloader:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "Overlap tiles"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "% of east:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "% of north:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Menu Name (Default)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "WMS URL (Default)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "Copy Selected Default(s)"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "Please select at least one row to copy."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "Downloader:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "Overlap tiles"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "% of east:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "% of north:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Remove"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21436,5 +21520,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "forest"
@@ -21728,6 +21812,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -21739,15 +21829,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr "Tools for drawing buildings."
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr "A special handler for the French land registry WMS server."
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -21764,10 +21854,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "Create a grid of ways."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -21776,10 +21866,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Allows to import various file formats into JOSM directly."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21790,15 +21880,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "Duplicate Ways with an offset"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21809,20 +21899,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr "Visualises routing information as a routing graph."
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "Provide a background layer that displays a map grid"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21835,15 +21925,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "Helps vectorising WMS images."
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21852,5 +21942,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21863,15 +21953,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "Adds no left turn for sets of 4 or 5 ways"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21882,5 +21972,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21893,20 +21983,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "Displays an OpenLayers background image"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Imports issues from OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21915,5 +22005,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21922,5 +22012,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21931,5 +22021,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21940,10 +22030,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "The great JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21952,15 +22042,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Let other applications send commands to JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21970,5 +22060,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21979,10 +22069,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Provides routing capabilities."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21991,5 +22081,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21999,16 +22089,31 @@
 "background and request updates."
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "Plug-in information"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Allow adding markers/nodes on current gps positions."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Provides a dialogue for editing tags in a tabular grid."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22021,15 +22126,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "Make terraced houses out of single blocks."
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22038,5 +22143,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22047,5 +22152,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22054,10 +22159,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22068,5 +22173,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22076,5 +22181,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22085,20 +22190,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Easy downloading along a long set of interconnected ways"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22109,5 +22214,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -23002,4 +23107,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -23007,5 +23156,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "roundabout"
@@ -23512,5 +23661,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "residential"
@@ -23559,5 +23708,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "service"
@@ -23590,6 +23739,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "construction"
@@ -24748,5 +24897,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "marsh"
@@ -24944,7 +25093,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "bicycle"
@@ -25220,8 +25369,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "rail"
@@ -26657,5 +26806,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "terminal"
@@ -27928,32 +28077,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "sport"
@@ -29750,9 +29933,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "green"
@@ -31415,5 +31598,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "subway"
@@ -31694,5 +31877,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31710,5 +31893,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "deprecated"
@@ -32085,7 +32268,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "highway_track"
@@ -32177,9 +32360,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "services"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32189,5 +32380,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "ford"
@@ -32206,7 +32397,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "highway_track"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "turningcircle"
@@ -32221,5 +32425,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr "emergency_access_point"
@@ -32233,5 +32437,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "riverbank"
@@ -32245,5 +32449,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "stream"
@@ -32257,5 +32461,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "dock"
@@ -32459,14 +32663,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "manmade"
@@ -32480,5 +32684,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr "rapids"
@@ -32540,7 +32744,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "railwaypoint"
@@ -32563,10 +32767,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "otherrail"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "railover"
@@ -32600,7 +32804,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "oldrail"
@@ -32645,6 +32849,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "aeroway"
@@ -32666,5 +32870,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "aeroway_dark"
@@ -32678,5 +32882,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "aeroway_light"
@@ -32754,8 +32958,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "aerialway"
@@ -32771,5 +32975,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "piste_easy"
@@ -32783,5 +32987,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "piste_intermediate"
@@ -32795,5 +32999,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "piste_advanced"
@@ -32807,5 +33011,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr "piste_expert"
@@ -32819,5 +33023,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "piste_freeride"
@@ -32831,5 +33035,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "piste_novice"
@@ -32949,11 +33153,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "power"
@@ -32966,5 +33170,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "pier"
@@ -32978,5 +33182,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "pipeline"
@@ -33120,13 +33324,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "leisure"
@@ -33140,5 +33344,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "marina"
@@ -33234,10 +33438,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "amenity"
@@ -33347,11 +33551,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "amenity_traffic"
@@ -33789,24 +33993,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "amenity_light"
@@ -33838,6 +34042,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "light_water"
@@ -33898,8 +34102,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "health"
@@ -34260,26 +34464,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "shop"
@@ -34351,8 +34555,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hotel"
@@ -34452,9 +34656,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "tourism"
@@ -34542,9 +34746,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "historic"
@@ -34557,5 +34761,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "quarry"
@@ -34569,5 +34773,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "landfill"
@@ -34589,5 +34793,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "basin"
@@ -34601,5 +34805,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "farmyard"
@@ -34622,5 +34826,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "retail"
@@ -34634,5 +34838,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "industrial"
@@ -34646,5 +34850,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "brownfield"
@@ -34658,5 +34862,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "greenfield"
@@ -34670,5 +34874,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "railland"
@@ -34725,7 +34929,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "military"
@@ -34739,5 +34943,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "cemetery"
@@ -34750,5 +34954,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "peak"
@@ -34763,5 +34967,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "glacier"
@@ -34775,5 +34979,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "volcano"
@@ -34827,8 +35031,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "natural"
@@ -34842,5 +35046,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "scrub"
@@ -34854,5 +35058,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "heath"
@@ -34866,5 +35070,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "woodarea"
@@ -34878,5 +35082,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "mud"
@@ -34890,5 +35094,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "beach"
@@ -34966,8 +35170,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "route"
@@ -35056,12 +35260,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "boundary"
@@ -35211,11 +35415,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "place"
@@ -35229,5 +35433,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr "tiger_data"
@@ -35595,4 +35799,42 @@
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Only up to two areas can be joined at the moment."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Joined self-overlapping area"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Enter values for all conflicts."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Solve Conflicts"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Join Areas: Remove Short Ways"
+
+#~ msgid "Closed Way"
+#~ msgstr "Closed Way"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr "Error: Unexpected line ''{0}'' in bookmark list from server"
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>Could not write bookmark.<br>{0}</html>"
 
 #~ msgid "The selected way does not contain the selected node."
Index: /applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- /applications/editors/josm/i18n/po/en_GB.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/en_GB.po	(revision 23252)
@@ -11,5 +11,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
 "PO-Revision-Date: 2010-09-02 22:13+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -19,5 +19,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:54+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,6 +85,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -237,5 +237,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -257,5 +256,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -277,7 +276,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -400,5 +400,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -425,4 +425,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -430,5 +431,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -463,5 +464,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Information"
@@ -675,8 +676,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -688,5 +689,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Delete"
@@ -862,14 +863,14 @@
 msgstr "Exit the application."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Fullscreen View"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Toggle fullscreen view"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Toggle Fullscreen view"
@@ -912,26 +913,22 @@
 msgstr "Display object information about OSM nodes, ways, or relations."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Join overlapping Areas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Joins areas that overlap each other"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "Please select at least one closed way that should be joined."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Only up to two areas can be joined at the moment."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" is not closed and therefore cannot be joined."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -942,5 +939,5 @@
 msgstr[1] "The selected ways have nodes outside of the downloaded data region."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -948,37 +945,67 @@
 msgstr "This can lead to nodes being deleted accidentally."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Are you really sure to continue?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Please abort if you are not sure"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "No intersection found. Nothing was changed."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Creating changeset..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Removing duplicate nodes..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Added node on all intersections"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Delete Ways that are not part of an inner multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Fix relations"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Joined self-overlapping area"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Joined overlapping areas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -988,33 +1015,22 @@
 "verify no errors have been introduced."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Enter values for all conflicts."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Solve Conflicts"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Fix tag conflicts"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Split way segment"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Removed Element from Relations"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Join Areas: Remove Short Ways"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Closed Way"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Remove tags from inner ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Join Areas Function"
@@ -1534,12 +1550,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1560,6 +1575,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1594,6 +1609,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Error"
@@ -1625,5 +1640,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1737,5 +1752,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Close"
@@ -1761,5 +1776,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "No, abort"
@@ -1791,5 +1806,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1986,10 +2001,10 @@
 msgstr "Unglued Node"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Dupe into {0} nodes"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2391,4 +2406,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2539,17 +2555,17 @@
 msgstr[1] "Add and move a virtual new node to {0} ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Move elements"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Move them"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Undo move"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2562,9 +2578,9 @@
 "Really move them?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Release the mouse button to select the objects in the rectangle."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2572,9 +2588,9 @@
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Release the mouse button to stop rotating."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3057,4 +3073,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3448,5 +3465,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "New value"
@@ -3519,15 +3535,15 @@
 msgstr "Illegal longitude value ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, 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:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Malformed config file at lines {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3538,5 +3554,5 @@
 "not a directory."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3547,5 +3563,5 @@
 "not a directory.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3556,5 +3572,5 @@
 "preference directory: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3565,5 +3581,5 @@
 "preference directory: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3572,5 +3588,5 @@
 "Warning: Missing preference file ''{0}''. Creating a default preference file."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3581,5 +3597,5 @@
 "file."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3590,5 +3606,5 @@
 "to default: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3599,5 +3615,5 @@
 "<br> and creating a new default preference file.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3607,16 +3623,4 @@
 "Warning: Failed to initialise preferences.Failed to reset preference file to "
 "default: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3633,27 +3637,4 @@
 msgid "Could not load preferences from server."
 msgstr "Could not load preferences from server."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr "Error: Unexpected line ''{0}'' in bookmark list from server"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4075,14 +4056,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "Wrong number of parameters for nodes operator."
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Error creating cache directory: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>Could not write bookmark.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4201,5 +4199,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "building"
@@ -4375,10 +4373,10 @@
 msgstr "If specified, reset the configuration instead of reading it."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Username"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4555,8 +4553,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4783,5 +4781,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5341,9 +5339,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5356,9 +5354,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5444,5 +5441,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "none"
@@ -5748,5 +5745,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5850,11 +5847,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Add"
@@ -6199,10 +6196,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "Select in relation list"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "Select relation in relation list."
@@ -7903,9 +7900,9 @@
 msgstr "This changeset query URL is invalid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Add Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7914,13 +7911,13 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "An empty value deletes the tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7928,10 +7925,10 @@
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Change values?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7940,5 +7937,5 @@
 msgstr[1] "Change properties of up to {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7947,77 +7944,86 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Please select a key"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Please select a value"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 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/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Properties/Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Properties for selected objects."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Member Of"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Properties: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Properties / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Change relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Delete from relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Really delete selection from relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Delete the selected key in all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Delete Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Add a new key/value pair to all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edit the value of the selected key for all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Properties for selected objects."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "Select relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "Select relation in main selection."
@@ -8781,5 +8787,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9423,5 +9429,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11743,13 +11749,13 @@
 msgstr "Retrieving user info..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Advanced Preferences"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Setting Preference entries directly. Use with caution!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11757,18 +11763,29 @@
 msgstr "Search: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Current value is default."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Default value is ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr "Default value currently unknown (setting has not been used yet)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Please select the row to delete."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Enter a new key/value pair"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11776,20 +11793,13 @@
 msgstr "Please select the row to edit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "New value for {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Please select the row to delete."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Enter a new key/value pair"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Value"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12363,5 +12373,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Enable built-in defaults"
@@ -12863,5 +12873,10 @@
 msgstr "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Could not read tagging preset source: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12871,10 +12886,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12884,5 +12899,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12891,5 +12906,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12898,5 +12913,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12905,9 +12920,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Sort presets menu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Tagging Presets"
@@ -14904,5 +14919,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "no description available"
@@ -14921,5 +14936,10 @@
 msgstr "The plug-in file ''{0}'' does not include a Manifest."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "More info..."
@@ -15372,5 +15392,5 @@
 "''{0}''. Using default code ''en''."
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -15478,4 +15498,28 @@
 "from preferences."
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Change Properties"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Import images"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Grab non-georeferenced image"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Error while loading page {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15838,4 +15882,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15856,5 +15901,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15862,5 +15907,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -16360,8 +16405,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "water"
@@ -16422,6 +16467,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "address"
@@ -16919,6 +16964,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Blank Layer"
@@ -17141,6 +17186,14 @@
 msgstr "No GPX data layer found."
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Internal Server Error"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -17163,5 +17216,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17876,5 +17929,5 @@
 msgstr "You must select at least two ways."
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -18658,4 +18711,9 @@
 msgid "Enter weight values"
 msgstr "Enter weight values"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "New value for {0}"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
@@ -20629,5 +20687,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "area"
@@ -20763,140 +20821,145 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Play/Pause"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Back"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Jump forwards"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Forwards"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Faster"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Slower"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20913,4 +20976,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -21019,6 +21086,12 @@
 msgstr "Node ''{0}'' is a junction with more than 2 connected ways."
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Enter a search expression"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -21046,5 +21119,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Menu Name"
@@ -21055,6 +21128,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Sport Facilities"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21085,5 +21159,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "WMS URL"
@@ -21223,24 +21297,24 @@
 "This may lead to wrong coordinates."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr "(deactivated)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS layer ({0}), automatically downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS layer ({0}), downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -21255,17 +21329,17 @@
 "tiles anyway?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "Yes, fetch images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "Invalid URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Download visible tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21273,63 +21347,63 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Reload erroneous tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Save WMS layer to file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Save WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Load WMS layer from file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "Load WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Unsupported WMS file version; found {0}, expected {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "File Format Error"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Error loading file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "Set WMS Bookmark"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Automatic downloading"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -21338,5 +21412,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -21346,73 +21420,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Open a blank WMS layer to load data from a file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "WMS Plug-in Preferences"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Modify list of WMS servers displayed in the WMS plug-in menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "Copy Selected Default(s)"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "Please select at least one row to copy."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "Downloader:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "Overlap tiles"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "% of east:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "% of north:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Menu Name (Default)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "WMS URL (Default)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "Copy Selected Default(s)"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "Please select at least one row to copy."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "Downloader:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "Overlap tiles"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "% of east:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "% of north:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Remove"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21479,5 +21564,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "forest"
@@ -21771,6 +21856,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -21782,15 +21873,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr "Tools for drawing buildings."
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr "A special handler for the French land registry WMS server."
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -21807,10 +21898,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "Create a grid of ways."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -21819,10 +21910,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Allows to import various file formats into JOSM directly."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21833,15 +21924,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "Duplicate Ways with an offset"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21852,20 +21943,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr "Visualises routing information as a routing graph."
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "Provide a background layer that displays a map grid"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21878,15 +21969,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "Helps vectorising WMS images."
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21895,5 +21986,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21906,15 +21997,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "Adds no left turn for sets of 4 or 5 ways"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr "Simply convert an area to a multipolygon."
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21925,5 +22016,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21936,20 +22027,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "Displays an OpenLayers background image"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Imports issues from OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21958,5 +22049,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21965,5 +22056,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21974,5 +22065,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21983,10 +22074,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "The great JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21995,15 +22086,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Let other applications send commands to JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -22013,5 +22104,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -22022,10 +22113,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Provides routing capabilities."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -22034,5 +22125,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -22042,16 +22133,31 @@
 "background and request updates."
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "Plug-in information"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Allow adding markers/nodes on current gps positions."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Provides a dialogue for editing tags in a tabular grid."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22064,15 +22170,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "Make terraced houses out of single blocks."
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22081,5 +22187,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22090,5 +22196,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22099,10 +22205,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22113,5 +22219,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22121,5 +22227,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22130,20 +22236,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Easy downloading along a long set of interconnected ways"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Select a sequence of non-branching connected ways"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22154,5 +22260,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -23047,4 +23153,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -23052,5 +23202,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "roundabout"
@@ -23557,5 +23707,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "residential"
@@ -23604,5 +23754,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "service"
@@ -23635,6 +23785,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "construction"
@@ -24793,5 +24943,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "marsh"
@@ -24989,7 +25139,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "bicycle"
@@ -25265,8 +25415,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "rail"
@@ -26702,5 +26852,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "terminal"
@@ -27973,32 +28123,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "sport"
@@ -29795,9 +29979,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "green"
@@ -31460,5 +31644,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "subway"
@@ -31739,5 +31923,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31755,5 +31939,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "deprecated"
@@ -32130,7 +32314,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "highway_track"
@@ -32222,9 +32406,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "services"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32234,5 +32426,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "ford"
@@ -32251,7 +32443,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "highway_track"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "turningcircle"
@@ -32266,5 +32471,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr "emergency_access_point"
@@ -32278,5 +32483,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "riverbank"
@@ -32290,5 +32495,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "stream"
@@ -32302,5 +32507,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "dock"
@@ -32504,14 +32709,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "manmade"
@@ -32525,5 +32730,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr "rapids"
@@ -32585,7 +32790,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "railwaypoint"
@@ -32608,10 +32813,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "otherrail"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "railover"
@@ -32645,7 +32850,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "oldrail"
@@ -32690,6 +32895,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "aeroway"
@@ -32711,5 +32916,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "aeroway_dark"
@@ -32723,5 +32928,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "aeroway_light"
@@ -32799,8 +33004,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "aerialway"
@@ -32816,5 +33021,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "piste_easy"
@@ -32828,5 +33033,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "piste_intermediate"
@@ -32840,5 +33045,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "piste_advanced"
@@ -32852,5 +33057,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr "piste_expert"
@@ -32864,5 +33069,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "piste_freeride"
@@ -32876,5 +33081,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "piste_novice"
@@ -32994,11 +33199,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "power"
@@ -33011,5 +33216,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "pier"
@@ -33023,5 +33228,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "pipeline"
@@ -33165,13 +33370,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "leisure"
@@ -33185,5 +33390,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "marina"
@@ -33279,10 +33484,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "amenity"
@@ -33392,11 +33597,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "amenity_traffic"
@@ -33834,24 +34039,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "amenity_light"
@@ -33883,6 +34088,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "light_water"
@@ -33943,8 +34148,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "health"
@@ -34305,26 +34510,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "shop"
@@ -34396,8 +34601,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hotel"
@@ -34497,9 +34702,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "tourism"
@@ -34587,9 +34792,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "historic"
@@ -34602,5 +34807,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "quarry"
@@ -34614,5 +34819,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "landfill"
@@ -34634,5 +34839,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "basin"
@@ -34646,5 +34851,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "farmyard"
@@ -34667,5 +34872,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "retail"
@@ -34679,5 +34884,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "industrial"
@@ -34691,5 +34896,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "brownfield"
@@ -34703,5 +34908,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "greenfield"
@@ -34715,5 +34920,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "railland"
@@ -34770,7 +34975,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "military"
@@ -34784,5 +34989,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "cemetery"
@@ -34795,5 +35000,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "peak"
@@ -34808,5 +35013,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "glacier"
@@ -34820,5 +35025,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "volcano"
@@ -34872,8 +35077,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "natural"
@@ -34887,5 +35092,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "scrub"
@@ -34899,5 +35104,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "heath"
@@ -34911,5 +35116,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "woodarea"
@@ -34923,5 +35128,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "mud"
@@ -34935,5 +35140,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "beach"
@@ -35011,8 +35216,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "route"
@@ -35101,12 +35306,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "boundary"
@@ -35256,11 +35461,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "place"
@@ -35274,5 +35479,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr "tiger_data"
@@ -35641,4 +35846,42 @@
 msgstr ""
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Only up to two areas can be joined at the moment."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Joined self-overlapping area"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Enter values for all conflicts."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Solve Conflicts"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Join Areas: Remove Short Ways"
+
+#~ msgid "Closed Way"
+#~ msgstr "Closed Way"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr "Error: Unexpected line ''{0}'' in bookmark list from server"
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>Could not write bookmark.<br>{0}</html>"
+
 #~ msgid "Move"
 #~ msgstr "Move"
@@ -36025,12 +36268,6 @@
 #~ msgstr "Conflicting relation"
 
-#~ msgid "Split way segment"
-#~ msgstr "Split way segment"
-
 #~ msgid "EPSG:4326"
 #~ msgstr "EPSG:4326"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Error while loading page {0}"
 
 #~ msgid "Open in Browser"
@@ -36766,7 +37003,4 @@
 #~ msgstr "Resolve conflicts in member list of relation {0}"
 
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Wrong number of parameters for nodes operator."
-
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
Index: /applications/editors/josm/i18n/po/es.po
===================================================================
--- /applications/editors/josm/i18n/po/es.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/es.po	(revision 23252)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
-"PO-Revision-Date: 2010-09-09 12:15+0000\n"
-"Last-Translator: sergionaranja <sergiosevillano.mail@gmail.com>\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
+"PO-Revision-Date: 2010-09-13 02:54+0000\n"
+"Last-Translator: IgorTamara <igor@tamarapatino.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:53+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -237,5 +237,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -257,5 +256,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -277,7 +276,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -399,5 +399,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -424,4 +424,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -429,5 +430,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -462,5 +463,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Información"
@@ -674,8 +675,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -687,5 +688,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Borrar"
@@ -864,14 +865,14 @@
 msgstr "Salir de la aplicación"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Vista a pantalla completa"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Cambiar a ver pantalla completa"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Cambiar a ver pantalla completa"
@@ -916,27 +917,23 @@
 "Muestra la información del objeto acerca de nodos, vías o relaciones OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Unir áreas superpuestas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Unir áreas que se superponen con otras"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
 "Por favor, seleccione al menos una vía cerrada, la cual se debe estar unida."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Hasta dos áreas pueden ser unidas por el momento."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" no está cerrado y, por tanto, no se puede unir."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -949,5 +946,5 @@
 "Las formas seleccionadas tienen nodos fuera de la región de datos descargada."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -955,37 +952,67 @@
 msgstr "Esto puede llevar a un borrado accidental de nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "¿Realmente está seguro de continuar?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Por favor aborte si no está seguro"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "No se encontró ninguna intersección. Nada ha cambiado."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Revertir conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Eliminando nodos duplicados..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Nodo añadido en todas las intersecciones"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Eliminar formas que no son parte de un multipolígono interior"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Arreglar relaciones"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Fusionar área superpuesta consigo misma"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Fusionar áreas superpuestas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -995,33 +1022,22 @@
 "favor compruebe que errores no se han introducido."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Introduzca valores para todos los conflictos."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Resolver conflictos"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Arreglar conflictos de etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Dividir segmento de vía"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Eliminar elementos de las relaciones"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Fusionar áreas: eliminar las vías cortas"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Vía cerrada"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Eliminar etiquetas de vías internas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Función para la fusión de áreas"
@@ -1561,12 +1577,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1587,6 +1602,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1621,6 +1636,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Error"
@@ -1652,5 +1667,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1765,5 +1780,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Cerrar"
@@ -1789,5 +1804,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "No, abortar"
@@ -1819,5 +1834,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -2015,10 +2030,10 @@
 msgstr "Nodo despegado"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Duplicado dentro de {0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2434,4 +2449,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2585,17 +2601,17 @@
 msgstr[1] "Añadir y mover un nuevo nodo virtual a {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Mover elementos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Moverlos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Deshacer mover"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2608,10 +2624,10 @@
 "¿Desea desplazarlos realmente?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
 "Soltar el botón del ratón para seleccionar los objetos en el rectángulo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2620,9 +2636,9 @@
 "más cercano."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Soltar el botón del ratón para parar de rotar."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3126,4 +3142,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3522,5 +3539,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Nuevo valor"
@@ -3595,15 +3611,15 @@
 msgstr "Valor de longitud ilegal \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, 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:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, 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:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3614,5 +3630,5 @@
 "preferencias ''{0}'' no es un directorio."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3623,5 +3639,5 @@
 "preferencias ''{0}'' no es un directorio.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3632,5 +3648,5 @@
 "de preferencias desaparecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3641,5 +3657,5 @@
 "directorio de preferencias desaparecido: {0}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3649,5 +3665,5 @@
 "preferencias por defecto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3658,5 +3674,5 @@
 "archivo por defecto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3667,5 +3683,5 @@
 "archivo de preferencias por defecto:{0}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3677,5 +3693,5 @@
 "defecto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3685,17 +3701,4 @@
 "Aviso: Error al inicializar las preferencias. Fallo al reiniciar el archivo "
 "de preferencias por defecto. {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Error: Línea ''{0}'' inesperada en el archivo de marcapáginas ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Error: Valor doble ilegal ''{0}'' en línea ''{1}'' en el archivo de "
-"marcapáginas ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3712,28 +3715,4 @@
 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:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-"Error: Línea ''{0}'' inesperada en la lista de marcapáginas del servidor"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-"Error: Valor doble ilegal ''{0}'' en la línea ''{1}'' en la lista de "
-"marcapáginas del servidor"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"Error al cargar marcadores desde ''{0}'' por razones de seguridad. La "
-"excepción fue: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4168,5 +4147,28 @@
 msgstr "Sistema geodésico UTM"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "Número de parámetros incorrecto para el operador de nodos."
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Error al crear directorio caché: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Error: Línea ''{0}'' inesperada en el archivo de marcapáginas ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Error: Valor doble ilegal ''{0}'' en línea ''{1}'' en el archivo de "
+"marcapáginas ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
@@ -4174,9 +4176,4 @@
 "<html>No se pueden leer los marcadores desde<br>''{0}''<br>El error fue: {1}"
 "</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>No se ha podido grabar el marcador.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4295,5 +4292,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "edificio"
@@ -4470,10 +4467,10 @@
 msgstr "Si se especifica, reinicie la configuración en lugar de leerla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4654,8 +4651,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4884,5 +4881,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5469,9 +5466,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5484,9 +5481,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5577,5 +5573,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "ninguno"
@@ -5891,5 +5887,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5998,11 +5994,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Añadir"
@@ -6349,10 +6345,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "Seleccionar en la lista de relaciones"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "Seleccionar relación en la lista de relaciones."
@@ -8076,9 +8072,9 @@
 msgstr "La URL de consulta de modificaciones no es válida"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Añadir propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -8087,13 +8083,13 @@
 msgstr[1] "Se modificarán {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "Un valor vacío borra el atributo."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -8101,10 +8097,10 @@
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "¿Modificar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -8113,5 +8109,5 @@
 msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -8120,78 +8116,87 @@
 msgstr[1] "Esto cambiará {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Por favor, selecciona una etiqueta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Por favor, selecciona un valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 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/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Propiedades/Relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Propiedades de los objetos seleccionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Miembro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr "Posición"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propiedades: {0} / Miembros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Propiedades / Miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Borrar de la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "¿Seguro de eliminar la selección de la relación {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Borrar la clave seleccionada en todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Eliminar propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Añadir una nueva pareja clave/valor para todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar el valor de la clave seleccionada para todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Propiedades de los objetos seleccionados."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "Seleccionar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "Seleccionar la relación en la selección principal."
@@ -8976,5 +8981,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9643,5 +9648,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11872,11 +11877,12 @@
 "</html>"
 msgstr ""
-"<html> JOSM descargó exitósamente una llave de Solicitud. JOSM ahora está "
-"lanzando una página de autorización en un navegador externo.  Por favor "
-"ingrese su nombre de usuario y clave de OSM y siga las instrucciones para "
-"autorizar la llave de solicitud.  Después vuelva a este diálogo y seleccione "
-"en <strong>{0}</strong><br><br>Si falla el abrir un navegador externo puede "
-"copiar la siguiente dirección de autorización y pegarla en el campo de "
-"dirección del navegador.</html>"
+"<html> JOSM descargó correctamente una solicitud de credencial de "
+"autentificación. JOSM ahora está lanzando una página de autorización en un "
+"navegador externo. Por favor, introduzca su nombre de usuario y contraseña "
+"de OSM y siga las instrucciones para autorizar la solicitud de credencial de "
+"autentificación.  Después vuelva a este diálogo y haga clic en <strong>{0}</"
+"strong><br><br>Si falla al abrir el navegador externo puede copiar la "
+"siguiente dirección de autorización y pegarla en el campo de dirección del "
+"navegador.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:275
@@ -11895,7 +11901,8 @@
 "authorization to the OSM server.<br><br>The access token is: </html>"
 msgstr ""
-"<html>JOSM ha descargado exitósamente la llave de Acceso.  Puede aceptarla.  "
-"JOSM la usará en el futuro para autenticación y autorización al servidor OSM."
-"<br><br>La llave de acceso es: </html>"
+"<html>JOSM ha descargado correctamente la credencial de autentificación de "
+"acceso. Ahora puede aceptar esta credencial.  JOSM la usará en el futuro "
+"para autentificarse y autorizarse en el servidor OSM.<br><br>La credencial "
+"de autentificación de acceso es: </html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:348
@@ -12022,14 +12029,14 @@
 msgstr "Obteniendo información de usuario..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Preferencias avanzadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr ""
 "Establece valores de preferencias manualmente. ¡Utilícelo con precaución!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -12037,14 +12044,14 @@
 msgstr "Buscar: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "El valor actual es el de por defecto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "El valor por defecto es ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
@@ -12052,5 +12059,16 @@
 "usado todavía)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Por favor, seleccione la fila a borrar"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Introduzca un par parámetro/valor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -12058,20 +12076,13 @@
 msgstr "Por favor, seleccione la fila a editar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Nuevo valor de {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Por favor, seleccione la fila a borrar"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Introduzca un par parámetro/valor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Valor"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12668,5 +12679,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Activar los valores predefinidos por defecto"
@@ -12690,7 +12701,7 @@
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
 msgstr[0] ""
-"Se ha descargado <strong>exitósamente</strong> el siguiente complemento:"
+"Se ha descargado <strong>correctamente</strong> el siguiente complemento:"
 msgstr[1] ""
-"Se han descargado <strong>exitósamente</strong> los siguientes {0} "
+"Se han descargado <strong>correctamente</strong> los siguientes {0} "
 "complementos:"
 
@@ -13173,5 +13184,10 @@
 "obtuvo \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -13183,10 +13199,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr "No se pudo leer la fuente predeterminada de etiquetas {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -13199,5 +13215,5 @@
 "es: [{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -13209,5 +13225,5 @@
 "table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -13219,5 +13235,5 @@
 "es: {1}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -13229,9 +13245,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Ordenar menú de preajustes"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Etiquetas preestablecidas"
@@ -13693,5 +13709,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:954
 msgid "Add relation"
-msgstr ""
+msgstr "Añadir relación"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:975
@@ -13718,5 +13734,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 msgid "New relation"
-msgstr ""
+msgstr "Nueva relación"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1078
@@ -15287,5 +15303,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "no hay descripción disponible"
@@ -15304,5 +15320,10 @@
 msgstr "El archivo del plugin \"{0}\" no contiene un Manifiesto."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "Más información..."
@@ -15764,5 +15785,5 @@
 "JOSm de localización. Usando el código predeterminado \"en\"."
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -15873,4 +15894,29 @@
 "geometría de la ventana a partir de las preferencias."
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Cambiar propiedades"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Importar imágenes"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Obtener imagen no georeferenciada"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr ""
+"Se produjo un error al crear la copia de seguridad de la capa eliminada: {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -16252,4 +16298,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr "Alinear vías"
@@ -16272,5 +16319,5 @@
 msgstr "Al alinear resultarían puntos fuera del planeta.\n"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr "Estoy list@!"
@@ -16278,5 +16325,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr "Consejos para Alinear Vías"
@@ -16861,8 +16908,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "lámina de agua"
@@ -16923,6 +16970,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "dirección"
@@ -17429,6 +17476,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Capa vacía"
@@ -17652,6 +17699,15 @@
 msgstr "No se encontró la capa de datos GPX"
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Herramientas externas"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+#, fuzzy
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr "El script hijo devolvió datos invalidos."
 
@@ -17674,5 +17730,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr "Utiliza scripts externos in JOSM"
@@ -17927,13 +17983,19 @@
 "with [irs rectify] in subject."
 msgstr ""
+"Esta opción crea una capa de ajuste IRS y una vía pequeña dentro de ella.  "
+"Requiere ajustar el lugar de su capa WMS primero.\n"
+"La capa resultante se guardará como .osm y será enviada a Komzpa (me@komzpa."
+"net) con el tema [irs rectify]."
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:70
 msgid "Zoom level was not enough to record an offset precisely"
 msgstr ""
+"El nivel de acercamiento no fue suficiente para almacenar un corrimiento "
+"preciso"
 
 #. if there are none, create one
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:103
 msgid "IRS Adjustment Layer"
-msgstr ""
+msgstr "Ajuste de capa IRS"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
@@ -18397,5 +18459,5 @@
 msgstr "Debes seleccionar al menos dos vías"
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -19188,4 +19250,9 @@
 msgid "Enter weight values"
 msgstr "Introduzca el peso de los valores"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Nuevo valor de {0}"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
@@ -21248,5 +21315,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "área"
@@ -21391,140 +21458,146 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "{0} {1}% de la traza GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr "Muestra la posición actual en el video"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr "Importar Video"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr "Sincronizar un video frente a esta traza GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr "Video Remoto"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr "Elimina el video actual de la capa"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr "reproducir/pausar"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Reproducción/Pausa"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr "Inicia/pausa la reproducción del video"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
 msgstr "retroceder"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr "ir n segundos atrás"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr "saltar"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Salta hacia delante"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr "salta al momento especificado por gps"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr "por favor ingrese el código de tiempo GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr "avanzar"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Avanzar"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr "salta n segundos adelante"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr "más rápido"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Más rápido"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr "reproducción más rápida"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr "más lento"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Más lento"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr "reproducción más lenta"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+#, fuzzy
+msgid "Loop"
 msgstr "ciclo"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr "ciclo de n segundos alrededor de la posición actual"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr "Mantener centrado"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr "Seguir el ícono de video automáticamente"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr "Subtítulos"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr "Mostrar subtítulos en el video"
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr "Longitud del salto"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 msgid "Set the length of a jump"
 msgstr "Establecer la longitud del salto"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr "Saltar el video por x milisegundos"
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr "Longitud del ciclo"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr "Establecer la longitud alrededor de un punto glorieta"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr "No deinterlacing"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr "deinterlacing usando line doubling"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr "deinterlacing usando interpolación linear"
@@ -21542,4 +21615,8 @@
 msgid "play"
 msgstr "reproducir"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
+msgstr "ciclo"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
@@ -21651,6 +21728,12 @@
 msgstr "El nodo ''{0}''  es un cruce de más de 2 vías conectadas."
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Introducir una expresión de búsqueda"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr "Seleccione un punto de vía para mover el mapa"
@@ -21679,5 +21762,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Nombre del menú"
@@ -21688,6 +21771,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr "Obtener capas"
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Instalaciones deportivas"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21720,5 +21804,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "Dirección URL del servicio WMS"
@@ -21858,5 +21942,5 @@
 "Esto puede dar lugar a unas coordenadas erróneas."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21865,19 +21949,19 @@
 "''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr "(desactivado)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Capa WMS ({0}) descargándose automáticamente en el zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Capa WMS ({0}), descargando en zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -21892,17 +21976,17 @@
 "teselas WMS de todos modos?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "Sí, descargar las imágenes"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "¿URL no válida?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Descargar las teselas visibles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21911,63 +21995,63 @@
 "más, o cambie la resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Cambiar resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Recargar teselas erróneas"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Canal alfa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Guardar capa WMS como archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Salvar capa WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Cargar capa WMS desde archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "Cargar capa WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Versión de archivo WMS no soportada; encontrada {0}, esperada {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Error en el formato del archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Error al leer el archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "Fijar marcador WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Descarga automática"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr "No se pudo inicializar el control remoto."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr "El plugin control remoto no es compatible con {0}."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -21978,5 +22062,5 @@
 "Debería actualizar los plugins"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -21989,22 +22073,22 @@
 "Si no se arregla actualizando el plugin, reporte un fallo para \"{0}\"."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr "{0}: Problema con control remoto"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 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"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Preferencias del componente WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
@@ -22015,52 +22099,63 @@
 "para añadirlo a la lista superior de servidores mostrados)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr "Añadir la url del WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "Copiar la/s seleccionada/s por defecto"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "Por favor, seleccione al menos una fila para copiar"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "Gestor de descarga:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "Superposición de teselas"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "% hacia el Este"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "% hacia el Norte"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr "Conexiones simultáneas"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr "Permitir control remoto(requiere el plugin de control remoto)"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Nombre del menú (por defecto)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "Dirección URL del servicio WMS (Por defecto)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr "Añadir la url del WMS"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "Copiar la/s seleccionada/s por defecto"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "Por favor, seleccione al menos una fila para copiar"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "Gestor de descarga:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "Superposición de teselas"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "% hacia el Este"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "% hacia el Norte"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr "Conexiones simultáneas"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr "Permitir control remoto(requiere el plugin de control remoto)"
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr "El control remoto solicitó descargar una capa WMS de la siguiente URL:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Eliminar"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -22127,5 +22222,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "plantación forestal"
@@ -22419,6 +22514,12 @@
 msgstr "Saturación:"
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -22431,10 +22532,10 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr "Herramientas para dibujar edificios."
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
@@ -22443,5 +22544,5 @@
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -22458,10 +22559,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "Crea una cuadrícula de viales"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -22469,10 +22570,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Permite importar directamente distintos formatos de archivo en JOSM."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -22483,15 +22584,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr "Descargar datos OSM cercanos a una vía"
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "Duplicado de vías con cierto desplazamiento unas de otras"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -22502,5 +22603,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
@@ -22509,15 +22610,15 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr "Visualiza la información de enrutamiento como un grafo de red."
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "Proporciona una capa de fondo que muestra una rejilla en el mapa"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -22531,15 +22632,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
-msgstr ""
+msgstr "Complemento irsrectify(rectificador irs)"
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "Ayuda a vectorizar imágenes WMS"
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -22549,5 +22650,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -22560,15 +22661,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "No añade ningún giro a la izquierda para conjuntos de 4 o 5 vías"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr "Convierte de manera sencilla un área a un multipolígono."
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -22579,5 +22680,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -22591,15 +22692,15 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr "Opciones extendidas para editar horario_de_atención"
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "Muestra una imágen OpenLayers de fondo"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
@@ -22608,5 +22709,5 @@
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -22616,5 +22717,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -22624,5 +22725,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -22634,5 +22735,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -22643,10 +22744,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "El gran JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -22656,15 +22757,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Dejar que otras aplicaciones envíen comandos a JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr "Componente para revertir conjuntos de cambios"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -22678,5 +22779,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -22688,10 +22789,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Proporciona capacidades de enrutamiento."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -22703,5 +22804,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -22711,11 +22812,27 @@
 "el mapa desplazable y solicitar actualizaciones."
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+#, fuzzy
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr "Crea y editar balizas de navegación para OpenSeaMap"
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "Información del complemento"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permite añadir marcadores/nodos a las posiciones GPS actual."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
@@ -22724,5 +22841,5 @@
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22736,15 +22853,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "Crea edificios entremedianeras a partir de bloques únicos"
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr "Crea y editar balizas de navegación para OpenSeaMap"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22755,5 +22872,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22764,5 +22881,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22773,10 +22890,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr "Premite desborrar un objeto de la base de datos OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22788,5 +22905,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22799,5 +22916,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22808,5 +22925,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -22814,15 +22931,15 @@
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr "Habilitar búsqueda de punto de vía en ficheros gpx."
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Selecciona una secuencia de vías conectadas no ramificadas"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22833,5 +22950,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -23727,4 +23844,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -23732,5 +23893,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "rotonda"
@@ -24237,5 +24398,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "calle urbana"
@@ -24284,5 +24445,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "vía de servicio"
@@ -24315,6 +24476,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "en construcción"
@@ -25474,5 +25635,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "marísma"
@@ -25670,7 +25831,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "bicicleta"
@@ -25946,8 +26107,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "ferrocarril"
@@ -27255,5 +27416,5 @@
 msgctxt "airport"
 msgid "Gate"
-msgstr ""
+msgstr "Puerta"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
@@ -27383,5 +27544,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "terminal"
@@ -28654,32 +28815,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "deporte"
@@ -30476,9 +30671,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "zona verde"
@@ -32153,5 +32348,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "metro"
@@ -32432,5 +32627,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32448,5 +32643,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "obsoleto"
@@ -32823,7 +33018,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "pista"
@@ -32915,9 +33110,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "servicios"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32927,5 +33130,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "vado"
@@ -32944,7 +33147,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "pista"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "círculo de giro"
@@ -32959,5 +33175,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr "Punto de acceso de emergencias"
@@ -32971,5 +33187,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "ribera"
@@ -32983,5 +33199,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "arroyo"
@@ -32995,5 +33211,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "muelle"
@@ -33197,14 +33413,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "hecho por el hombre"
@@ -33218,5 +33434,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr "rápidos"
@@ -33278,7 +33494,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "punto ferroviario"
@@ -33301,10 +33517,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "otros ferrocarriles"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "paso con más de un cruce ferroviario"
@@ -33338,7 +33554,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "vía muerta"
@@ -33383,6 +33599,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "aerovía"
@@ -33404,5 +33620,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "pista (oscuro)"
@@ -33416,5 +33632,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "pista (claro)"
@@ -33492,8 +33708,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "pista de rodadura"
@@ -33509,5 +33725,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "pista fácil"
@@ -33521,5 +33737,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "pista intermedia"
@@ -33533,5 +33749,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "pista avanzada"
@@ -33545,5 +33761,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr "pista para expertos"
@@ -33557,5 +33773,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "pista de estilo libre"
@@ -33569,5 +33785,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "pista para iniciados"
@@ -33687,11 +33903,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "energía"
@@ -33704,5 +33920,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "muelle"
@@ -33716,5 +33932,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "tubería"
@@ -33858,13 +34074,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "ocio"
@@ -33878,5 +34094,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "puerto deportivo"
@@ -33972,10 +34188,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "servicios"
@@ -34085,11 +34301,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "tráfico de ocio"
@@ -34527,24 +34743,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "equipamiento lumínico"
@@ -34576,6 +34792,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "agua (claro)"
@@ -34636,8 +34852,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "salud"
@@ -34998,26 +35214,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "tienda"
@@ -35089,8 +35305,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hotel"
@@ -35190,9 +35406,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "turismo"
@@ -35280,9 +35496,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "patrimonio histórico"
@@ -35295,5 +35511,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "cantera"
@@ -35307,5 +35523,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "vertedero"
@@ -35327,5 +35543,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "cuenca"
@@ -35339,5 +35555,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "edificio agrario"
@@ -35360,5 +35576,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "venta al por menor"
@@ -35372,5 +35588,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "industrial"
@@ -35384,5 +35600,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "área postindustrial degradada"
@@ -35396,5 +35612,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "área rururbana"
@@ -35408,5 +35624,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "zona ferroviaria"
@@ -35463,7 +35679,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "zona militar"
@@ -35477,5 +35693,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "cementerio"
@@ -35488,5 +35704,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "pico"
@@ -35501,5 +35717,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "glaciar"
@@ -35513,5 +35729,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "volcán"
@@ -35565,8 +35781,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "espacio natural"
@@ -35580,5 +35796,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "matorral"
@@ -35592,5 +35808,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "monte"
@@ -35604,5 +35820,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "plantación forestal"
@@ -35616,5 +35832,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "lodazal"
@@ -35628,5 +35844,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "playa"
@@ -35704,8 +35920,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "ruta"
@@ -35794,12 +36010,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "frontera"
@@ -35949,11 +36165,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "lugar"
@@ -35967,5 +36183,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr "datos_TIGER"
@@ -36334,4 +36550,61 @@
 msgstr "PCN 2006 - Italia"
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Hasta dos áreas pueden ser unidas por el momento."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Fusionar área superpuesta consigo misma"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Introduzca valores para todos los conflictos."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Resolver conflictos"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Fusionar áreas: eliminar las vías cortas"
+
+#~ msgid "Closed Way"
+#~ msgstr "Vía cerrada"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr ""
+#~ "Error: Línea ''{0}'' inesperada en la lista de marcapáginas del servidor"
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr ""
+#~ "Error: Valor doble ilegal ''{0}'' en la línea ''{1}'' en la lista de "
+#~ "marcapáginas del servidor"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Error al cargar marcadores desde ''{0}'' por razones de seguridad. La "
+#~ "excepción fue: {1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>No se ha podido grabar el marcador.<br>{0}</html>"
+
+#~ msgid "play/pause"
+#~ msgstr "reproducir/pausar"
+
+#~ msgid "jump"
+#~ msgstr "saltar"
+
+#~ msgid "forward"
+#~ msgstr "avanzar"
+
+#~ msgid "faster"
+#~ msgstr "más rápido"
+
+#~ msgid "slower"
+#~ msgstr "más lento"
+
+#~ msgid "Get Layers"
+#~ msgstr "Obtener capas"
+
 #~ msgid "Move"
 #~ msgstr "Mover"
@@ -36582,7 +36855,4 @@
 #~ msgid "Conflicting relation"
 #~ msgstr "Relación con conclicto"
-
-#~ msgid "Split way segment"
-#~ msgstr "Dividir segmento de vía"
 
 #~ msgid "Degrees Minutes Seconds"
@@ -37391,7 +37661,4 @@
 #~ msgstr "Falta número de versión en los datos OSM"
 
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Número de parámetros incorrecto para el operador de nodos."
-
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Valor incorrecto del operador de ID: {0}. Se esperaba un número."
Index: /applications/editors/josm/i18n/po/et.po
===================================================================
--- /applications/editors/josm/i18n/po/et.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/et.po	(revision 23252)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
-"PO-Revision-Date: 2010-09-10 13:19+0000\n"
-"Last-Translator: Margus Värton <margus@dakar.ee>\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
+"PO-Revision-Date: 2010-09-12 15:41+0000\n"
+"Last-Translator: jaakl <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 21:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -232,5 +232,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -252,5 +251,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -272,7 +271,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -393,5 +393,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -418,4 +418,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -423,5 +424,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -456,5 +457,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Info"
@@ -666,8 +667,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -679,5 +680,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Kustuta"
@@ -853,14 +854,14 @@
 msgstr "Rakenduse sulgemine."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Täisekraanvaade"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Täisekraanvaate lülitamine"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Täisekraanvaate lülitamine"
@@ -903,26 +904,22 @@
 msgstr "Kuvab info OSM teede, sõlmede ja relatsioonide objektide kohta."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Kattuvate alade ühendamine"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Ühendab üksteist katvad alad"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "Palun vali vähemalt ühendamised vähemalt üks suletud tee."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Praegu saab ühendada ainult kuni kaks ala."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" ei ole suletud ning seega ei saa seda ühendada."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -933,5 +930,5 @@
 msgstr[1] "Valitud teedel on sõlmesid väljaspool alla laetud andmete ala."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -939,37 +936,67 @@
 msgstr "See võib põhjustada sõlmede soovimatut kustutamist."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Kas sa tõesti soovid jätkata?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Kui Sa pole kindel, palun katkesta tegevus"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Lõikumist ei leitud. Mitte midagi ei muudetud."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Joogipood"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Eemalda valitud"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Sõlm lisatud kõikidesse lõikumiskohtadesse."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Kustutada teed, mis pole sisemise multihulknurga osad"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Paranda relatsioonid"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Ühendatud iseenesega kattuv ala"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Kattuvate alade ühendamine"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -979,33 +1006,22 @@
 "tekitatud vigu."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Sisesta kõigi vastuolude kohta väärtused."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Lahenda vastuolud."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Paranda sildikonfliktid"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Lõika tee {0} {1} osaks"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Element relatsioonidest eemaldatud"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Alade ühendamine: Eemalda lühikesed teed"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Suletud tee"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Eemalda sildid sisemistelt teedelt"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Alade ühendamise funktsioon"
@@ -1510,12 +1526,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1536,6 +1551,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1570,6 +1585,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Viga"
@@ -1601,5 +1616,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1711,5 +1726,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Sulge"
@@ -1735,5 +1750,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Ei, katkesta"
@@ -1765,5 +1780,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1957,10 +1972,10 @@
 msgstr "Lahtisulatatud sõlm"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Kordista {0} sõlmeks"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2355,4 +2370,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2498,17 +2514,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Liiguta elemente"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Võta liigutamine tagasi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2521,18 +2537,18 @@
 "Kas liigutame neid elemente?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Pööramise lõpetamiseks vabasta hiire nupp."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2985,4 +3001,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3364,5 +3381,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr ""
@@ -3435,15 +3451,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3452,5 +3468,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3459,5 +3475,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3466,5 +3482,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3473,5 +3489,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3479,5 +3495,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3486,5 +3502,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3493,5 +3509,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3500,5 +3516,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3507,15 +3523,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
@@ -3530,23 +3535,4 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
 msgstr ""
 
@@ -3955,12 +3941,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, 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:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
 msgstr ""
 
@@ -4080,5 +4080,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr ""
@@ -4254,10 +4254,10 @@
 msgstr "Kui määratud, lähtestab konfiguratsiooni selle lugemise asemel."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4428,8 +4428,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4647,5 +4647,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5176,9 +5176,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5191,9 +5191,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5279,5 +5278,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr ""
@@ -5565,5 +5564,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5662,11 +5661,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Lisa"
@@ -6011,10 +6010,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr ""
@@ -7664,9 +7663,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Lisa seaded"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7675,13 +7674,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7689,10 +7688,10 @@
 msgstr "<erinev>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Muuta väärtusi?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7701,5 +7700,5 @@
 msgstr[1] "Muuda kuni {0} objekti seadeid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7708,77 +7707,86 @@
 msgstr[1] "See muudab kuni {0} objekti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Palun vali võti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Palun vali väärtus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 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/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Seaded/Liikmelisus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Valitud objektide seaded"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "On liikmeks järgnevas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Seaded: {0} / Liikmelisus: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Seaded / Liikmelisus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Muuda seost"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Tõesti soovid kustutada valikut seosest {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Kustuta valitud võti kõkides objektides"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Kustuda seadeid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Lisa uus võtme/väärtuse paar kõikidele objektidele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Muuda kõikide valitud objektide võtme väärtust"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Valitud objektide seaded"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr ""
@@ -8505,5 +8513,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9095,5 +9103,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11234,13 +11242,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11248,18 +11256,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Palun vali rida kustutamiseks"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11267,20 +11286,13 @@
 msgstr "PAlun vali rida muutmiseks"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Palun vali rida kustutamiseks"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
+msgstr "Muuta väärtusi?"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Väärtus"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -11829,5 +11841,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr ""
@@ -12295,5 +12307,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Ei saa lugeda sildistamise eelseadeid: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12303,10 +12320,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12316,5 +12333,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12323,5 +12340,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12330,5 +12347,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12337,9 +12354,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr ""
@@ -14206,5 +14223,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "kirjeldust pole saadaval"
@@ -14221,5 +14238,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr ""
@@ -14588,5 +14610,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -14682,4 +14704,28 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Muuda seadeid"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Piltide import"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Piltide import"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Viga parsimisel"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15038,4 +15084,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15056,5 +15103,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15062,5 +15109,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -15545,8 +15592,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr ""
@@ -15607,6 +15654,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "aadress"
@@ -16069,6 +16116,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Tühi kiht"
@@ -16286,6 +16333,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+msgid "External tool error"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16308,5 +16362,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17011,5 +17065,5 @@
 msgstr ""
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr ""
@@ -17778,4 +17832,9 @@
 msgstr ""
 
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr ""
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
@@ -19708,5 +19767,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr ""
@@ -19842,140 +19901,145 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Esita /paus"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Tagasi"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Hüppa edasi"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Edasi"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Kiiremini"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Aeglasemalt"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -19992,4 +20056,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20086,6 +20154,12 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "regulaaravaldis"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20113,5 +20187,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr ""
@@ -20122,6 +20196,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Spordirajatised"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20152,5 +20227,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr ""
@@ -20282,24 +20357,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20310,80 +20385,80 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20392,5 +20467,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20400,73 +20475,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Ava tühi WMS kiht andmete laadimiseks failist"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Mastaap"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Eemalda"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20529,5 +20615,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "kultuurmets"
@@ -20821,6 +20907,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -20830,15 +20922,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr ""
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -20850,10 +20942,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -20861,10 +20953,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -20873,15 +20965,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -20890,20 +20982,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -20913,15 +21005,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "Aitab WMS kujutisi vektoriseerida"
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -20929,5 +21021,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -20937,15 +21029,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -20954,5 +21046,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -20962,20 +21054,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20983,5 +21075,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20989,5 +21081,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20996,5 +21088,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21003,10 +21095,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21014,15 +21106,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21032,5 +21124,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21039,10 +21131,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21051,5 +21143,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21057,16 +21149,30 @@
 msgstr ""
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+msgid "Plugin for Seamap Editor"
+msgstr ""
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21076,15 +21182,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21093,5 +21199,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21100,5 +21206,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21107,10 +21213,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21119,5 +21225,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21127,5 +21233,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21134,20 +21240,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21156,5 +21262,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22048,4 +22154,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22053,5 +22203,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr ""
@@ -22558,5 +22708,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr ""
@@ -22605,5 +22755,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr ""
@@ -22636,6 +22786,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr ""
@@ -23794,5 +23944,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr ""
@@ -23990,7 +24140,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "jalgrattaga"
@@ -24266,8 +24416,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "raudtee"
@@ -25703,5 +25853,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "lennuterminal"
@@ -26974,32 +27124,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr ""
@@ -28233,10 +28417,10 @@
 #: build/trans_presets.java:2627
 msgid "Works"
-msgstr "Töökojad"
+msgstr "Tööstushoone"
 
 #. item "Man Made/Works" label "Edit Works"
 #: build/trans_presets.java:2628
 msgid "Edit Works"
-msgstr "Vali töökojad"
+msgstr "Muuda Tööstushoone"
 
 #. item "Man Made/Tower"
@@ -28796,9 +28980,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "roheala"
@@ -30461,5 +30645,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "metroo"
@@ -30740,5 +30924,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -30756,5 +30940,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "kasutusest väljas"
@@ -31131,7 +31315,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "teerada"
@@ -31223,9 +31407,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "teenused"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31235,5 +31427,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr ""
@@ -31252,7 +31444,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "teerada"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "tagasipööramisring"
@@ -31267,5 +31472,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr ""
@@ -31279,5 +31484,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "jõekallas"
@@ -31291,5 +31496,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "oja"
@@ -31303,5 +31508,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "dokk"
@@ -31505,14 +31710,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "inimtekkeline"
@@ -31526,5 +31731,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -31586,7 +31791,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "raudteepunkt"
@@ -31609,10 +31814,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "muu rööbastee"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "ülarelss"
@@ -31646,7 +31851,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "kasutamata raudtee"
@@ -31691,6 +31896,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "aeronautika"
@@ -31712,5 +31917,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "helikopterid"
@@ -31724,5 +31929,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "kerglennukid"
@@ -31800,8 +32005,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "köisraudtee"
@@ -31817,5 +32022,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "suusanõlv lihtne"
@@ -31829,5 +32034,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "suusanõlv keskmine"
@@ -31841,5 +32046,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "suusanõlv edasijõudnutele"
@@ -31853,5 +32058,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr ""
@@ -31865,5 +32070,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "suusanõlv klassita"
@@ -31877,5 +32082,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "suusanõlv algajale"
@@ -31995,11 +32200,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "elektrivarustus"
@@ -32012,5 +32217,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "kai"
@@ -32024,5 +32229,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "torujuhe"
@@ -32166,13 +32371,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "puhkealad"
@@ -32186,5 +32391,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "paadisadam"
@@ -32280,10 +32485,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "mugavused"
@@ -32393,11 +32598,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "autohooldus"
@@ -32835,24 +33040,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "muud teenused"
@@ -32884,6 +33089,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "vesi"
@@ -32944,8 +33149,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "tervishoid"
@@ -33306,26 +33511,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "pood"
@@ -33397,8 +33602,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hotell"
@@ -33498,9 +33703,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "turism"
@@ -33588,9 +33793,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "alalooline"
@@ -33603,5 +33808,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "kivimurd"
@@ -33615,5 +33820,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "prügimägi"
@@ -33635,5 +33840,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "tehisjärv"
@@ -33647,5 +33852,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "taluõu"
@@ -33668,5 +33873,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "kaubandus"
@@ -33680,5 +33885,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "tööstus"
@@ -33692,5 +33897,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "jäätmaa"
@@ -33704,5 +33909,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "rohepiirkond"
@@ -33716,5 +33921,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "raudteede piirkond"
@@ -33771,7 +33976,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "militaarala"
@@ -33785,5 +33990,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "kalmistu"
@@ -33796,5 +34001,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "mäetipp"
@@ -33809,5 +34014,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "liustik"
@@ -33821,5 +34026,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "vulkaan"
@@ -33873,8 +34078,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "looduslik"
@@ -33888,5 +34093,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "põõsastik"
@@ -33900,5 +34105,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "nõmm"
@@ -33912,5 +34117,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr ""
@@ -33924,5 +34129,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "muda"
@@ -33936,5 +34141,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "rand"
@@ -34012,8 +34217,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "teekond"
@@ -34102,12 +34307,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "piir"
@@ -34257,11 +34462,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "koht"
@@ -34275,5 +34480,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -34645,4 +34850,22 @@
 #~ msgstr "Lae OSMi serverisse"
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Praegu saab ühendada ainult kuni kaks ala."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Ühendatud iseenesega kattuv ala"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Sisesta kõigi vastuolude kohta väärtused."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Lahenda vastuolud."
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Alade ühendamine: Eemalda lühikesed teed"
+
+#~ msgid "Closed Way"
+#~ msgstr "Suletud tee"
+
 #~ msgid "Move"
 #~ msgstr "Liiguta"
@@ -34677,7 +34900,4 @@
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Ei suuda avada eelistuste kataloogi: {0}"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Viga parsimisel"
 
 #~ msgid "their version:"
@@ -34763,7 +34983,4 @@
 #~ msgid "Occupied By"
 #~ msgstr "Kasutab"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Eemalda valitud"
 
 #~ msgid "Add all currently selected objects as members"
Index: /applications/editors/josm/i18n/po/eu.po
===================================================================
--- /applications/editors/josm/i18n/po/eu.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/eu.po	(revision 23252)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
 "PO-Revision-Date: 2010-07-06 17:47+0000\n"
 "Last-Translator: Mikel Lizarralde <mlizarralde@tagzania.com>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:53+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -238,5 +238,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -258,5 +257,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -278,7 +277,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -401,5 +401,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -426,4 +426,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -431,5 +432,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -464,5 +465,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Argibideak"
@@ -675,8 +676,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -688,5 +689,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Ezabatu"
@@ -865,14 +866,14 @@
 msgstr "Aplikaziotik irten"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Pantaila osoko ikuspegia"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Txandakatu pantaila osoko ikuspegia"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Txandakatu pantaila osoko ikuspegia"
@@ -915,27 +916,23 @@
 msgstr "Erakutsi OSM-ko nodo, bide eta erlazioen objektu informazioa."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Batu gainezarririko azalerak"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Elkar gainezarri egiten diren azalerak batu egiten ditu"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
 "Mesedez, aukera ezazu gehitu beharko genukeen  itxitako bide bat  gutxienez."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Une honetan azalera bat edo bi besterik ezin dira gehitu."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" itxi gabe dagoenez, ezin dugu lotu"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -947,5 +944,5 @@
 "Aukeratutako bideek deskargatutako ingurunetik kanpoko nodoak dituzte."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -953,37 +950,67 @@
 msgstr "Hau dela eta, zenbait nodo nahi gabe ezabatzea gertatu daiteke."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Jarraitzeko ziur zaude?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Mesedez, eten ez bazaude ziur"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Ez da ebakidurarik aurkitu. Ez da ezer aldatu."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Aldaketa-multzoak"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Bateratu bikoiztutako nodoak?"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Ebakidura guztietan nodoa gehituta"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Barne-multipoligono baten parte ez diren bideak ezabatu"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Erlazioak konpondu"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Auto-teilakatze azalera gainjarri da"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Elkarren gainean dauden azalerak batu egin dira"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -993,33 +1020,22 @@
 "ezazu ez direla erroreak gehitu."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Gatazka guztientzako balioak sartu"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Gatazkak konpondu"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Etiketa gatazkak konpondu"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "{0} bidea {1} zatitan banatu"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Erlazioetatik elementua ezabatua izan da"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Gehitu azalerak: ezabatu bide zidorrak"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Itxitako bidea"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Barne bideetatik etiketak kendu"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Azalera_gehitu funtzioa"
@@ -1556,12 +1572,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1582,6 +1597,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1616,6 +1631,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Errorea"
@@ -1647,5 +1662,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1760,5 +1775,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Itxi"
@@ -1784,5 +1799,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Ez, bertan behera utzi"
@@ -1814,5 +1829,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -2012,10 +2027,10 @@
 msgstr "Itsatsi gabeko nodoa"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Bikoiztu {0} nodoetan"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2433,4 +2448,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2583,17 +2599,17 @@
 msgstr[1] "{0} bideei nodo birtual berri bat gehitu eta mugitu"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Elementuak mugitu"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Mugitu horiek guztiak"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Mugimendua desegin"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2606,9 +2622,9 @@
 "Benetan denak mugitu nahi dituzu?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Askatu saguaren botoia errektanguluko objektuak hautatzeko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2617,9 +2633,9 @@
 "egiteko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Askatu saguaren botoia errotazioa gelditzeko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3126,4 +3142,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3518,5 +3535,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Balio berria"
@@ -3589,15 +3605,15 @@
 msgstr "Longitudearen ''{0}'' balio ilegalak"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Kontuz: huts egin du hobespenak ''{0}'' gordetzean"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Konfigurazio fitxategian malformazioa {0} lerroetan"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3608,5 +3624,5 @@
 "ez da direktorio bat."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3617,5 +3633,5 @@
 "direktorioa ez da direktorio bat.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3626,5 +3642,5 @@
 "hobespen direktorioa sortzean: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3635,5 +3651,5 @@
 "hobespenen direktorioa sortzean: {0}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3643,5 +3659,5 @@
 "fitxategi bat sortzen."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3652,5 +3668,5 @@
 "fitxategiagatik."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3661,5 +3677,5 @@
 "fitxategia jatorrizkora berrezartzeak: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3670,5 +3686,5 @@
 "da <br>{0}<br>n eta lehenetsitako hobespen fitxategia sortzen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3678,17 +3694,4 @@
 "Kontuz: Hobespenen berrezartzeak huts egin du. Lehenetsitako hobespenen "
 "fitxategia berrabiaraztean huts egin du: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Errorea: Espero ez zen ''{0}'' lerroa laster-marka honetan ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Errorea: \"{2}\" fitxategi-markatzailearen \"{1}\". lerroan \"{0}\" balio "
-"bikoitz ilegala dago"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3705,28 +3708,4 @@
 msgid "Could not load preferences from server."
 msgstr "Hobespenak ezin izan dira zerbitzaritik kargatu."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-"Errorea: Espero ez zen ''{0}'' lerroa zerbitzariaren laster-marken zerrendan"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-"Errorea: Onartzen ez den  ''{0}''ren balio bikoitza laster-marken "
-"zerrendaren ''{1}'' lerroan"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"Ezin izan dira  ''{0}''ko laster-markak kargatu seguritate arrazoiengatik. "
-"Salbuespena hauxe: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4151,5 +4130,26 @@
 msgstr "UTM Sistema-geodesikoa"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Errorea: Espero ez zen ''{0}'' lerroa laster-marka honetan ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Errorea: \"{2}\" fitxategi-markatzailearen \"{1}\". lerroan \"{0}\" balio "
+"bikoitz ilegala dago"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
@@ -4157,9 +4157,4 @@
 "<html>Ezin izan ditugu irakurri laster markak hemendik:"
 "<br>''{0}''<br>Errorea: {1}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>Ezin izan dugu lastermarka idatzi.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4278,5 +4273,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "eraikina"
@@ -4453,10 +4448,10 @@
 msgstr "Zehazten bada, garbitu konfigurazioa, irakurri beharrean."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Erabiltzaile izena"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4638,8 +4633,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4865,5 +4860,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5425,9 +5420,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5440,9 +5435,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5528,5 +5522,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "ezer ere ez"
@@ -5814,5 +5808,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5910,11 +5904,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Gehitu"
@@ -6261,10 +6255,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr ""
@@ -7914,9 +7908,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Propietateak gehitu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7925,13 +7919,13 @@
 msgstr[1] "Horrela {0} objekturaino aldatuko dira."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7939,10 +7933,10 @@
 msgstr "<ezberdina>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Balioak aldatu?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7951,5 +7945,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7958,77 +7952,86 @@
 msgstr[1] "Horrela {0} objekturaino aldatuko dira."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Mesedez, aukeratu balio bat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 msgid "Please select the objects you want to change properties for."
 msgstr "Mesedez, aukeratu propietateak editatzea nahi dizkiezun objektuak."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Propietateak/Partaidetzak"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Aukeratutako objektuen propietateak"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Partaidea"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr "Kokapena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propietateak: {0} / Partaidetzak: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Propietateak / Partaidetzak"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Erlazioa aldatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Erlaziotik ezabatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Propietateak ezabatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Aukeratutako objektuen propietateak"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "Erlazioa aukeratu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr ""
@@ -8754,5 +8757,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9342,5 +9345,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11477,13 +11480,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11491,18 +11494,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11510,20 +11524,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
+msgstr "Balioak aldatu?"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Balioa"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12072,5 +12079,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr ""
@@ -12538,5 +12545,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12546,10 +12558,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12559,5 +12571,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12566,5 +12578,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12573,5 +12585,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12580,9 +12592,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr ""
@@ -14441,5 +14453,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr ""
@@ -14456,5 +14468,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr ""
@@ -14823,5 +14840,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -14910,4 +14927,26 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Aldatu propietateak"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Bideoa inportatu"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+msgid "Import georeferenced image"
+msgstr ""
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+msgid "Error while creating image layer: "
+msgstr ""
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15266,4 +15305,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15284,5 +15324,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15290,5 +15330,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -15773,8 +15813,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr ""
@@ -15835,6 +15875,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr ""
@@ -16297,6 +16337,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Geruza garbia"
@@ -16514,6 +16554,14 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Zerbitzariaren barneko errorea"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16536,5 +16584,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17239,5 +17287,5 @@
 msgstr ""
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr ""
@@ -18006,4 +18054,9 @@
 msgstr ""
 
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr ""
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
@@ -19941,5 +19994,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "azalera"
@@ -20082,140 +20135,146 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "GPS arrastoaren % {0} {1}tik"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr "Bideoan egungo kokapena erakusten du"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr "Bideoa inportatu"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr "Sinkronizatu bideo bat GPS arrastoarekin"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr "Bideoa ezabatu"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr "bideoa ezabatzen du geruzatik"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr "erreproduzitu/pausatu"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Erreproduzitu/etenaldi (pause)"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr "hasi/pausatu bideoaren play-back-a"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
 msgstr "atzerantz"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Salto aurrera"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr "aurrerantz"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Aurrera"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr "azkarrago"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Azkarrago"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr "play-back-a azkarrago"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr "polikiago"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Mantsoago"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr "play-back-a polikiago"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+#, fuzzy
+msgid "Loop"
 msgstr "begizta"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr "Zentratuta mantendu"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr "bideoaren ikonoa jarraitzen du automatikoki"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr "Jauziaren luzera"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 msgid "Set the length of a jump"
 msgstr "Jauziaren luzera ezarri"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr "X ms-etarako bideo-jauzia"
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr "Begizta-luzera"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr "Begizta-puntuaren inguruko luzera ezarri"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20233,4 +20292,8 @@
 msgid "play"
 msgstr "erreproduzitu"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
+msgstr "begizta"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
@@ -20334,6 +20397,12 @@
 "da."
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Sar ezazu bilatu nahi duzun adierazpidea"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20361,5 +20430,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Menu-izena"
@@ -20370,6 +20439,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Kirol-instalazioak"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20400,5 +20470,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "WMSaren URL helbidea"
@@ -20535,5 +20605,5 @@
 "Koordenatu okerretara eraman gaitzake honek."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -20541,19 +20611,19 @@
 "Kontuz: WMS geruza desaktibatu egin da \"{0}\" URLaren malformazioagatik"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr "(desaktibatua)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "({0}) WMS geruza, automatikoki jaisten {1} zoom mailan"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "({0}) WMS geruza, {1} zoom mailan jaisten"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20568,17 +20638,17 @@
 "jaitsi nahi dituzu?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "Bai, jaitsi irudiak"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "URL desegokia?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Jaitsi ikusgai dauden \"tile\"ak"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20587,33 +20657,33 @@
 "bereizmena"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Bereizmena aldatu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "\"Tile\" okerrak berriz kargatu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Alpha kanala"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Gorde WMS geruza fitxategian"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Gorde WMS geruza"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Kargatu WMS geruza fitxategitik"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "Kargatu WMS geruza"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -20621,30 +20691,30 @@
 "Sustengurik gabeko WMS fitxategi-bertsioa; {0} aurkitu da eta {1} espero zen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Fitxategiaren formatuan errorea"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Fitxategia kargatzean errorea"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "WMS laster-marka ezarri"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Jaitsiera automatikoa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20653,5 +20723,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20661,74 +20731,85 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Ireki WMS geruza-zuri bat fitxategi batetik datuak kargatzeko"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "WMSen gehigarrien hobespenak"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 "WMS gehigarrien menuan agertzen diren WMS zerbitzarien zerrenda editatu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "Aukeratutako lehenetsia(k) kopiatu"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "Mesedez, aukeratu kopiatzeko lerro bat gutxienez."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "Jaitsiera kudeatzailea:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "\"Tile\"-en gainjartzea"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "ekialdera % :"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "iparraldera %:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr "Aldibereko konexioak"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Zooma"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Menu-izena (lehenetsia)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "WMSaren URL helbidea (lehenetsia)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "Aukeratutako lehenetsia(k) kopiatu"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "Mesedez, aukeratu kopiatzeko lerro bat gutxienez."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "Jaitsiera kudeatzailea:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "\"Tile\"-en gainjartzea"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "ekialdera % :"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "iparraldera %:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr "Aldibereko konexioak"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Ezabatu"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20795,5 +20876,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "basoa"
@@ -21087,6 +21168,12 @@
 msgstr "Saturazioa"
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -21096,10 +21183,10 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr "Eraikinak marrazteko erremintak."
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
@@ -21107,5 +21194,5 @@
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -21117,10 +21204,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "Bideen lauki bat sortu."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -21128,10 +21215,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Zenbait fitxategi-formatu JOSMra zuzenean inportatzeko aukera."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21142,15 +21229,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "Batak bestearekiko lerrokatu gabe dauden bikoiztutako bideak"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21161,5 +21248,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
@@ -21167,15 +21254,15 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr "Bideratze-informazioa bideratze-grafo moduan erakusten du."
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "Mapa-sareta bat hondoko-geruza moduan eskuratzeko aukera"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21188,15 +21275,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "WMS irudiak bektorizatzeko laguntza."
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21204,5 +21291,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21212,15 +21299,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "Ezkerrera biratzeko debekua gehitzen die 4 edo 5 bide-multzoei"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr "Azalera bat multipoligono batean bilakatzen du era errazean."
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21231,5 +21318,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21239,20 +21326,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "OpenLayers-eko irudi bat erakusten du hondoan"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "OpenStreetBugs-etik akatsak jaisten ditu"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21262,5 +21349,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21270,5 +21357,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21279,5 +21366,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21288,10 +21375,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "JGoodies Plastic handiaren \"Look and Feel\"-a."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21300,15 +21387,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Utzi beste aplikazioei JOSMra komandoak bidaltzen."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr "Aldaketa-multzoak"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21318,5 +21405,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21328,10 +21415,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Bideratzaile-gaitasunak ematen ditu"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21343,5 +21430,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21351,11 +21438,25 @@
 "daitekeen mapa batentzako eta eguneraketak eskatu."
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+msgid "Plugin for Seamap Editor"
+msgstr ""
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Egungo GPS kokapenean markak/nodoak gehitzeko aukera ematen digu."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
@@ -21364,5 +21465,5 @@
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21376,15 +21477,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "Bloke bakanetatik elkar-atxikitako etxeak sortzen ditu"
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21395,5 +21496,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21404,5 +21505,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21413,5 +21514,5 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
@@ -21420,5 +21521,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21430,5 +21531,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21441,5 +21542,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21451,20 +21552,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Elkar-konektaturiko bide luzeen deskarga erraza"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Aukeratu adarkadura ez dute konektaturiko bideak"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21475,5 +21576,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22369,4 +22470,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22374,5 +22519,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "errotonda"
@@ -22879,5 +23024,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "kalea"
@@ -22926,5 +23071,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "zerbitzu-bidea"
@@ -22957,6 +23102,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "eraikitzen"
@@ -24115,5 +24260,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "padura"
@@ -24311,7 +24456,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "bizikleta"
@@ -24587,8 +24732,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "trenbidea"
@@ -26024,5 +26169,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "terminala"
@@ -27295,32 +27440,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "kirola"
@@ -29117,9 +29296,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "berdea"
@@ -30782,5 +30961,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "metroa"
@@ -31061,5 +31240,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31077,5 +31256,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "zaharkitua"
@@ -31452,7 +31631,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "pista"
@@ -31544,9 +31723,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "zerbitzu-bidea"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31556,5 +31743,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "ibi"
@@ -31573,7 +31760,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "pista"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "biratzeko zirkulua"
@@ -31588,5 +31788,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr "Larrialdi-gunera sarrera"
@@ -31600,5 +31800,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "ibaiertza"
@@ -31612,5 +31812,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "erreka"
@@ -31624,5 +31824,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "kaia"
@@ -31826,14 +32026,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "gizakiak eraikia"
@@ -31847,5 +32047,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr "ur-lasterrak"
@@ -31907,7 +32107,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "trenbide-puntua"
@@ -31930,10 +32130,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "beste trenbideak"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "trenbide bat baino gehiago gurutzatzen diren lekua"
@@ -31967,7 +32167,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "utzitako bidea"
@@ -32012,6 +32212,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "aireko bidea"
@@ -32033,5 +32233,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "aireko bidea (iluna)"
@@ -32045,5 +32245,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "aireko bidea (argia)"
@@ -32121,8 +32321,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "aire-bidea"
@@ -32138,5 +32338,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "pista erraza"
@@ -32150,5 +32350,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "bitarteko-pista"
@@ -32162,5 +32362,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "pista aurreratua"
@@ -32174,5 +32374,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr "adituentzako pista"
@@ -32186,5 +32386,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "estilo libreko pista"
@@ -32198,5 +32398,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "hasiberrientzako pista"
@@ -32316,11 +32516,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "energia"
@@ -32333,5 +32533,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "kaia"
@@ -32345,5 +32545,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "hodia"
@@ -32487,13 +32687,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "aisia"
@@ -32507,5 +32707,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "itsas-portua"
@@ -32601,10 +32801,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "zerbitzuak"
@@ -32714,11 +32914,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "zerbitzua_trafikoa"
@@ -33156,24 +33356,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "zerbitzua_argiztapena"
@@ -33205,6 +33405,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "ura (argia)"
@@ -33265,8 +33465,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "osasuna"
@@ -33627,26 +33827,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "denda"
@@ -33718,8 +33918,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hotel"
@@ -33819,9 +34019,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "turismoa"
@@ -33909,9 +34109,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "ondare historikoa"
@@ -33924,5 +34124,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "harrobia"
@@ -33936,5 +34136,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "zabortegia"
@@ -33956,5 +34156,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "dartsena"
@@ -33968,5 +34168,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "etxaldea"
@@ -33989,5 +34189,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "txikizkako merkataritza"
@@ -34001,5 +34201,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "industriala"
@@ -34013,5 +34213,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "hustutako industrialdea"
@@ -34025,5 +34225,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "lurzoru eraikigarria"
@@ -34037,5 +34237,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "tren-ingurunea"
@@ -34092,7 +34292,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "gune militarra"
@@ -34106,5 +34306,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "kanposantu"
@@ -34117,5 +34317,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "gailurra"
@@ -34130,5 +34330,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "glaziar"
@@ -34142,5 +34342,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "sumendia"
@@ -34194,8 +34394,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "natura-gune"
@@ -34209,5 +34409,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "sasi"
@@ -34221,5 +34421,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "mendia"
@@ -34233,5 +34433,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "basoa"
@@ -34245,5 +34445,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "lokatza"
@@ -34257,5 +34457,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "hondartza"
@@ -34333,8 +34533,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "ibilbidea"
@@ -34423,12 +34623,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "muga"
@@ -34578,11 +34778,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "lekua"
@@ -34596,5 +34796,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr "TIGER_datuak"
@@ -34963,4 +35163,56 @@
 msgstr ""
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Une honetan azalera bat edo bi besterik ezin dira gehitu."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Auto-teilakatze azalera gainjarri da"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Gatazka guztientzako balioak sartu"
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Gatazkak konpondu"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Gehitu azalerak: ezabatu bide zidorrak"
+
+#~ msgid "Closed Way"
+#~ msgstr "Itxitako bidea"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr ""
+#~ "Errorea: Espero ez zen ''{0}'' lerroa zerbitzariaren laster-marken "
+#~ "zerrendan"
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr ""
+#~ "Errorea: Onartzen ez den  ''{0}''ren balio bikoitza laster-marken "
+#~ "zerrendaren ''{1}'' lerroan"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Ezin izan dira  ''{0}''ko laster-markak kargatu seguritate "
+#~ "arrazoiengatik. Salbuespena hauxe: {1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>Ezin izan dugu lastermarka idatzi.<br>{0}</html>"
+
+#~ msgid "play/pause"
+#~ msgstr "erreproduzitu/pausatu"
+
+#~ msgid "forward"
+#~ msgstr "aurrerantz"
+
+#~ msgid "faster"
+#~ msgstr "azkarrago"
+
+#~ msgid "slower"
+#~ msgstr "polikiago"
+
 #~ msgid "The selected way does not contain the selected node."
 #~ msgid_plural "The selected way does not contain all the selected nodes."
Index: /applications/editors/josm/i18n/po/fi.po
===================================================================
--- /applications/editors/josm/i18n/po/fi.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/fi.po	(revision 23252)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
 "PO-Revision-Date: 2010-09-06 01:44+0000\n"
 "Last-Translator: Mika Laari <laari@iki.fi>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -236,5 +236,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -256,5 +255,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -276,7 +275,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -399,5 +399,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -424,4 +424,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -429,5 +430,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -462,5 +463,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Tiedot"
@@ -672,8 +673,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -685,5 +686,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Poista"
@@ -859,14 +860,14 @@
 msgstr "Poistu ohjelmasta."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Kokoruututila"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Kokoruututila päälle/pois"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Kokoruututila päälle/pois"
@@ -909,26 +910,22 @@
 msgstr "Näytä tietoja OSM-pisteistä, -poluista tai -relaatioista."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Yhdistä päällekkäiset alueet"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Yhdistää alueet, jotka ovat osittain toistensa päällä"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "Valitse yhdistettäväksi ainakin yksi suljettu polku"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Korkeintaan kaksi aluetta voidaan yhdistää tällä hetkellä."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" ei ole suljettu, eikä sitä voi siten yhdistää."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -939,5 +936,5 @@
 msgstr[1] "Valituissa poluissa on pisteitä ladatun alueen ulkopuolella."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -945,37 +942,67 @@
 msgstr "Tämä voi johtaa pisteiden poistamiseen vahingossa."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Haluatko varmasti jatkaa?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Ole hyvä ja keskeytä toiminto jos et ole varma"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Leikkauspisteitä ei löytynyt, joten mitään ei muutettu."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Muutoskokoelmaa luodaan..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Poistetaan pisteiden kaksoiskappaleet..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Lisää piste kaikkiin leikkauskohtiin"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Poista polut, jotka eivät ole monimonikulmion sisämonikulmioita"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Korjaa relaatiot"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Yhdistettiin itsensä kanssa päällekkäinen alue"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Yhdistettiin osittain päällekkäiset alueet"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -985,33 +1012,22 @@
 "syntynyt virheitä."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Syötä arvot kaikille ristiriidoille."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Ratkaise ristiriidat"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Korjaa tagikonflikteja"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Katkaise polku"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Kohde poistettiin relaatioista"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Alueiden yhdistus: Lyhyiden polkujen poisto"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Suljettu polku"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Poista tagit inner-poluilta"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Yhdistä alueet -tominto"
@@ -1544,12 +1560,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1570,6 +1585,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1604,6 +1619,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Virhe"
@@ -1635,5 +1650,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1746,5 +1761,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Sulje"
@@ -1770,5 +1785,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Ei, peruuta"
@@ -1800,5 +1815,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1997,10 +2012,10 @@
 msgstr "Irroitettu piste"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Monista {0} pisteeksi"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2408,4 +2423,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2560,17 +2576,17 @@
 msgstr[1] "Lisää uusi virtuaalisolmu {0} polkuun ja siirrä sitä"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Siirrä objekteja"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Toteuta siirto"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Kumoa siirto"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2583,9 +2599,9 @@
 "Haluatko varmasti siirtää ne?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2594,9 +2610,9 @@
 "yhdistääksesi lähimpään pisteeseen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Vapauta hiiren painike pyörityksen lopettamiseksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3095,4 +3111,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3488,5 +3505,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Uusi arvo"
@@ -3563,15 +3579,15 @@
 msgstr "Virheellinen pituuspiiri ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Varoitus: asetusten tallennus tiedostoon \"{0}\" epäonnistui"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Konfiguraatiotiedostossa virhe riv(e)illä {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3582,5 +3598,5 @@
 "hakemisto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3591,5 +3607,5 @@
 "hakemisto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3600,5 +3616,5 @@
 "voitu luoda: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3609,5 +3625,5 @@
 "voitu luoda: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3617,5 +3633,5 @@
 "asetustiedosto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3626,5 +3642,5 @@
 "asetustiedostolla."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3635,5 +3651,5 @@
 "palauttaa oletusarvoihin: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3644,5 +3660,5 @@
 "<br> ja luodaan uusi oletusarvoinen asetustiedosto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3652,17 +3668,4 @@
 "Varoitus: Asetusten alustaminen epäonnistui. Asetustiedostoa ei voitu "
 "palauttaa oletusarvoihin: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Virhe: Odottamaton rivi \"{0}\" kirjanmerkkitiedostossa \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Virhe: Virheellinen double-liukuluku \"{0}\" kirjanmerkkitiedoston \"{2}\" "
-"rivillä \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3679,27 +3682,4 @@
 msgid "Could not load preferences from server."
 msgstr "Asetuksia ei voitu ladata palvelimelta."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr "Virhe: Odottamaton rivi \"{0}\" palvelimen kirjanmerkkilistassa"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-"Virhe: Virheellinen double-liukuluku \"{0}\" palvelimen kirjanmerkkilistan "
-"rivillä \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"Kirjanmerkkien lataus URLista \"{0}\" epäonnistui turvallisuussyistä. Virhe "
-"oli: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4124,5 +4104,27 @@
 msgstr "UTM-karttajärjestelmä"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Virhe luotaessa välimuistihakemistoa: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Virhe: Odottamaton rivi \"{0}\" kirjanmerkkitiedostossa \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Virhe: Virheellinen double-liukuluku \"{0}\" kirjanmerkkitiedoston \"{2}\" "
+"rivillä \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
@@ -4130,9 +4132,4 @@
 "<html>Kirjanmerkkejä ei voitu lukea tiedostosta<br>\"{0}\"<br>Virhe oli: {1}"
 "</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>Kirjanmerkkejä ei voitu kirjoittaa.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4251,5 +4248,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "rakennus"
@@ -4425,10 +4422,10 @@
 msgstr "Jos määritetty, nollaa asetukset niiden lukemisen sijaan."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Käyttäjänimi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4607,8 +4604,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4834,5 +4831,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5395,9 +5392,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5410,9 +5407,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5498,5 +5494,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "ei mitään"
@@ -5801,5 +5797,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5907,11 +5903,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Lisää"
@@ -6257,10 +6253,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "Valitse relaatioluettelosta"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "Valitse relaatio relaatioluettelosta"
@@ -7914,9 +7910,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Lisää ominaisuuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7925,13 +7921,13 @@
 msgstr[1] "Olet muuttamassa {0} kohdetta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "Tyhjä arvo poistaa avaimen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7939,10 +7935,10 @@
 msgstr "<eri>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Muutetaanko arvot?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7951,5 +7947,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7958,77 +7954,86 @@
 msgstr[1] "Olet muuttamassa {0} kohdetta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Valitse avain"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Valitse arvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 msgid "Please select the objects you want to change properties for."
 msgstr "Valitse kohteet, joiden ominaisuuksia haluat muokata."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Ominaisuudet/jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Valittujen objektien ominaisuudet."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Ominaisuudet / Jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Muuta relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Poista relaatiosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Poistetaanko valinta relaatiosta {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Poista valittu avain kaikista objekteista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Poista asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Lisää uusi arvo/avain-pari kaikkiin objekteihin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Muokkaa valitun avaimen arvoa kaikissa objekteissa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Valittujen objektien ominaisuudet."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "Valitse relaatio"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "Valitse relaatio päävalinnasta"
@@ -8785,5 +8790,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9399,5 +9404,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11573,13 +11578,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Lisäasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Muutetaan asetusmuuttujien arvoja suoraan. Käytä tätä vain harkiten!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11587,18 +11592,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Nykyinen arvo on oletus."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Oletusarvo on \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr "Oletusarvo on tuntematon (asetusta ei ole vielä käytetty)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Ole hyvä ja valitse poistettava rivi."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Anna uusi avain/arvo-pari"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11606,20 +11622,13 @@
 msgstr "Ole hyvä ja valitse muokattava rivi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Uusi arvo {0}:lle"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Ole hyvä ja valitse poistettava rivi."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Anna uusi avain/arvo-pari"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Arvo"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12178,5 +12187,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Käytä sisäänrakennettuja oletusarvoja"
@@ -12646,5 +12655,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12654,10 +12668,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12667,5 +12681,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12674,5 +12688,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12681,5 +12695,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12688,9 +12702,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Tagien esivalinnat"
@@ -14582,5 +14596,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "kuvausta ei ole saatavilla"
@@ -14599,5 +14613,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "Lisää tietoa..."
@@ -14980,5 +14999,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -15074,4 +15093,28 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Muuta ominaisuuksia"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Tuo kuvia"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Tuodut kuvat"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Virhe poistetun tason varmuuskopion luonnissa {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15430,4 +15473,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15448,5 +15492,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15454,5 +15498,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -15937,8 +15981,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "vesi"
@@ -15999,6 +16043,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "osoite"
@@ -16461,6 +16505,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Tyhjä taso"
@@ -16678,6 +16722,14 @@
 msgstr "GPX-tasoa ei löytynyt."
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Sisäinen palvelinvirhe"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16700,5 +16752,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17413,5 +17465,5 @@
 msgstr ""
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -18187,4 +18239,9 @@
 msgid "Enter weight values"
 msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Uusi arvo {0}:lle"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
@@ -20138,5 +20195,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "alue"
@@ -20274,140 +20331,145 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Toista/tauko"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Takaisin"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Siirry eteenpäin"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Eteenpäin"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Nopeammin"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Hitaammin"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20424,4 +20486,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20518,6 +20584,12 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Kirjoita hakulauseke"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20545,5 +20617,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr ""
@@ -20554,6 +20626,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Liikuntapaikka"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20584,5 +20657,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr ""
@@ -20714,24 +20787,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20742,17 +20815,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20761,63 +20834,63 @@
 "resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Vaihda resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Tallenna WMS-taso tiedostoon"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Lataa WMS-taso tiedostosta"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Virhe ladattaessa tiedostoa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Automaattinen lataus"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20826,5 +20899,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20834,73 +20907,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Luo tyhjä WMS-taso, johon voit avata kuvatiedoston."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "WMS-liitännäisen asetukset"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Voit muokata käytettävissä olevien WMS-palvelinten listaa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Zoomaus"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Poista"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20965,5 +21049,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "talousmetsä"
@@ -21257,6 +21341,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -21266,15 +21356,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr ""
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -21286,10 +21376,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -21297,10 +21387,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21309,15 +21399,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21326,20 +21416,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21349,15 +21439,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21365,5 +21455,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21373,15 +21463,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21390,5 +21480,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21398,20 +21488,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21419,5 +21509,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21425,5 +21515,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21432,5 +21522,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21439,10 +21529,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21450,15 +21540,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21468,5 +21558,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21475,10 +21565,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21487,5 +21577,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21493,16 +21583,30 @@
 msgstr ""
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+msgid "Plugin for Seamap Editor"
+msgstr ""
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21512,15 +21616,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21529,5 +21633,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21536,5 +21640,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21543,10 +21647,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21555,5 +21659,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21563,5 +21667,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21570,20 +21674,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21592,5 +21696,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22484,4 +22588,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22489,5 +22637,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "kiertoliittymä"
@@ -22994,5 +23142,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "asuinkatu"
@@ -23041,5 +23189,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr ""
@@ -23072,6 +23220,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr ""
@@ -24230,5 +24378,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "suo"
@@ -24426,7 +24574,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "polkupyörä"
@@ -24702,8 +24850,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr ""
@@ -26139,5 +26287,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "terminaali"
@@ -27410,32 +27558,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "urheilu"
@@ -29232,9 +29414,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr ""
@@ -30897,5 +31079,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "metro"
@@ -31176,5 +31358,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31192,5 +31374,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr ""
@@ -31567,7 +31749,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr ""
@@ -31659,9 +31841,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr ""
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31671,5 +31861,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr ""
@@ -31688,7 +31878,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "Asemalaituri"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "kääntöympyrä"
@@ -31703,5 +31906,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr ""
@@ -31715,5 +31918,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr ""
@@ -31727,5 +31930,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr ""
@@ -31739,5 +31942,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr ""
@@ -31941,14 +32144,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr ""
@@ -31962,5 +32165,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -32022,7 +32225,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr ""
@@ -32045,10 +32248,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr ""
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr ""
@@ -32082,7 +32285,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr ""
@@ -32127,6 +32330,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr ""
@@ -32148,5 +32351,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr ""
@@ -32160,5 +32363,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr ""
@@ -32236,8 +32439,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "köysirata"
@@ -32253,5 +32456,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr ""
@@ -32265,5 +32468,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr ""
@@ -32277,5 +32480,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr ""
@@ -32289,5 +32492,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr ""
@@ -32301,5 +32504,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr ""
@@ -32313,5 +32516,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr ""
@@ -32431,11 +32634,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr ""
@@ -32448,5 +32651,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "laituri"
@@ -32460,5 +32663,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr ""
@@ -32602,13 +32805,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr ""
@@ -32622,5 +32825,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr ""
@@ -32716,10 +32919,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr ""
@@ -32829,11 +33032,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr ""
@@ -33271,24 +33474,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr ""
@@ -33320,6 +33523,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr ""
@@ -33380,8 +33583,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr ""
@@ -33742,26 +33945,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "kauppa"
@@ -33833,8 +34036,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hotelli"
@@ -33934,9 +34137,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "turismi"
@@ -34024,9 +34227,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "historiallinen"
@@ -34039,5 +34242,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "louhos"
@@ -34051,5 +34254,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "kaatopaikka"
@@ -34071,5 +34274,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "valuma-alue"
@@ -34083,5 +34286,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr ""
@@ -34104,5 +34307,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "kaupallinen"
@@ -34116,5 +34319,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "teollisuus"
@@ -34128,5 +34331,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr ""
@@ -34140,5 +34343,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr ""
@@ -34152,5 +34355,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "rata-alue"
@@ -34207,7 +34410,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "armeija"
@@ -34221,5 +34424,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "hautausmaa"
@@ -34232,5 +34435,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "huippu"
@@ -34245,5 +34448,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "jäätikkö"
@@ -34257,5 +34460,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "tulivuori"
@@ -34309,8 +34512,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr ""
@@ -34324,5 +34527,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "pusikko"
@@ -34336,5 +34539,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "nummi"
@@ -34348,5 +34551,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr ""
@@ -34360,5 +34563,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "muta"
@@ -34372,5 +34575,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "ranta"
@@ -34448,8 +34651,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "reitti"
@@ -34538,12 +34741,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "raja"
@@ -34693,11 +34896,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr ""
@@ -34711,5 +34914,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -35078,4 +35281,42 @@
 msgstr ""
 
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Syötä arvot kaikille ristiriidoille."
+
+#~ msgid "Closed Way"
+#~ msgstr "Suljettu polku"
+
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Korkeintaan kaksi aluetta voidaan yhdistää tällä hetkellä."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Yhdistettiin itsensä kanssa päällekkäinen alue"
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Ratkaise ristiriidat"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Alueiden yhdistus: Lyhyiden polkujen poisto"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr "Virhe: Odottamaton rivi \"{0}\" palvelimen kirjanmerkkilistassa"
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr ""
+#~ "Virhe: Virheellinen double-liukuluku \"{0}\" palvelimen "
+#~ "kirjanmerkkilistan rivillä \"{1}\""
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Kirjanmerkkien lataus URLista \"{0}\" epäonnistui turvallisuussyistä. "
+#~ "Virhe oli: {1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>Kirjanmerkkejä ei voitu kirjoittaa.<br>{0}</html>"
+
 #~ msgid "Unknown version"
 #~ msgstr "Tuntematon versio"
@@ -35245,7 +35486,4 @@
 #~ msgid "Only one node selected"
 #~ msgstr "Vain yksi piste valittuna"
-
-#~ msgid "Split way segment"
-#~ msgstr "Katkaise polku"
 
 #~ msgid ""
Index: /applications/editors/josm/i18n/po/fr.po
===================================================================
--- /applications/editors/josm/i18n/po/fr.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/fr.po	(revision 23252)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
-"PO-Revision-Date: 2010-09-06 01:49+0000\n"
-"Last-Translator: Emilien Klein <emilien+ubuntu@klein.st>\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
+"PO-Revision-Date: 2010-09-16 08:04+0000\n"
+"Last-Translator: Jérôme BLUM <Unknown>\n"
 "Language-Team: Fr <>\n"
 "MIME-Version: 1.0\n"
@@ -14,5 +14,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
@@ -81,6 +81,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -235,5 +235,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -255,5 +254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -275,7 +274,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -399,5 +399,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -424,4 +424,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -429,5 +430,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -462,5 +463,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Information"
@@ -674,8 +675,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -687,5 +688,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Supprimer"
@@ -862,14 +863,14 @@
 msgstr "Quitter l’application"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Affichage plein écran"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Basculer l’affichage plein écran"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Basculer l’affichage plein écran"
@@ -912,26 +913,22 @@
 msgstr "Afficher les informations des nœuds, chemins ou relations"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Joindre les zones superposées"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Joindre des zones qui se superposent"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "Veuillez sélectionner au moins un chemin fermée qui doit être joint."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Seulement deux aires au maximum peuvent être jointes pour le moment."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" n’est pas fermé et ne peut donc pas être joint."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -944,5 +941,5 @@
 "Les chemins sélectionnés ont des nœuds à l'extérieur de la zone téléchargée."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -950,38 +947,68 @@
 msgstr "Cela peut conduire à la suppression accidentelle de nœuds."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Êtes-vous sûr(e) de vouloir continuer ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Veuillez abandonner svp si vous n’êtes pas sûr(e)"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Pas d’intersection trouvée. Rien n’a été modifié."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Réversion du groupe de changement"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Suppression des nœuds en doublon…"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Nœuds ajoutés sur toutes les intersections"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 "Supprimer les chemins qui ne font pas partie d’un multipolygone interne"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Corriger les relations"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "A fusionné une aire superposée sur elle-même"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "A fusionné des aires superposées"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -991,33 +1018,22 @@
 "vérifier qu’aucune erreur n’a été introduite."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Entrer des valeurs pour tous les conflits."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Résoudre les conflits"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Résoudre les conflits d’attributs"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Séparer le segment du chemin"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Élément supprimé des relations"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Joindre les aires : supprimer les chemins courts"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Chemin fermé"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Supprime les attributs des chemins internes"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Fonction de jonction des aires"
@@ -1557,12 +1573,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1583,6 +1598,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1617,6 +1632,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Erreur"
@@ -1648,5 +1663,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1761,5 +1776,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Fermer"
@@ -1785,5 +1800,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Non, annuler"
@@ -1815,5 +1830,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -2013,10 +2028,10 @@
 msgstr "Nœud séparé"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Dupliquer en {0} nœuds"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2429,4 +2444,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2582,17 +2598,17 @@
 msgstr[1] "Ajouter et déplacer un nouveau nœud virtuel aux {0} chemins."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Déplacer des éléments"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Les déplacer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Annuler le déplacement"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2605,5 +2621,5 @@
 "Confirmez-vous ce déplacement massif ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2611,5 +2627,5 @@
 "rectangle."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2618,9 +2634,9 @@
 "fusionner avec le nœud le plus proche."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Relacher le bouton de souris pour arrêter la rotation."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3129,4 +3145,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3525,5 +3542,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Nouvelle valeur"
@@ -3601,15 +3617,15 @@
 msgstr "Valeur de longitude ''{0}'' erronée"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, 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:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, 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:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3620,5 +3636,5 @@
 "préférences ''{0}'' n’est pas un dossier."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3629,5 +3645,5 @@
 "préférences ''{0}'' n’est pas un dossier.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3638,5 +3654,5 @@
 "le dossier manquant des préférences : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3647,5 +3663,5 @@
 "manquant des préférences : {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3655,5 +3671,5 @@
 "fichier de préférences par défaut."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3664,5 +3680,5 @@
 "par défaut."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3673,5 +3689,5 @@
 "le fichier des préférences par défaut : {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3683,5 +3699,5 @@
 "préférences par défaut.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3691,18 +3707,4 @@
 "Attention : l’initialisation des préférences a échoué. Impossible de "
 "rétablir le fichier des préférences par défaut : {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-"Erreur : Ligne ''{0}'' inattendue dans le fichier des marque-pages ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Erreur : valeur double erronée ''{0}'' à la ligne ''{1}'' dans le fichier "
-"des marque-pages ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3719,28 +3721,4 @@
 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:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-"Erreur : ligne ''{0}'' inattendue dans le fichier des marque-pages du serveur"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-"Erreur : valeur double erronée ''{0}'' à la ligne ''{1}'' dans la liste des "
-"marque-pages du serveur"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"Le chargement des marque-pages depuis ''{0}'' a échoué pour des raisons de "
-"sécurité. Exception : {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4144,5 +4122,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
 msgid "Offset 3.000.000m east"
-msgstr ""
+msgstr "Décalage 3 000 000 m Est"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4174,5 +4152,29 @@
 msgstr "Système UTM Geodesic"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "Erreur de nombre de paramètre pour une opération sur des nœuds."
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Erreur lors de la création du dossier de cache : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+"Erreur : Ligne ''{0}'' inattendue dans le fichier des marque-pages ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Erreur : valeur double erronée ''{0}'' à la ligne ''{1}'' dans le fichier "
+"des marque-pages ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
@@ -4180,9 +4182,4 @@
 "<html>Impossible de lire les marque-pages depuis<br>''{0}''<br>Erreur : {1}</"
 "html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>Le marque-page ne peut être écrit.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4301,5 +4298,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "bâtiment"
@@ -4479,10 +4476,10 @@
 "Si spécifié, rétablir la configuration par défaut au lieu de lire ceci."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4669,8 +4666,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4898,5 +4895,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5468,9 +5465,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5483,9 +5480,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5573,5 +5569,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "rien"
@@ -5886,5 +5882,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5991,11 +5987,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Ajouter"
@@ -6342,10 +6338,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "Sélectionner dans la liste des relations"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "Sélectionnez une relation dans la liste des relations."
@@ -8065,9 +8061,9 @@
 msgstr "Cette URL de requête pour le groupe de modifications n’est pas valide"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Ajouter des propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -8076,13 +8072,13 @@
 msgstr[1] "Cette action modifiera {0} objets."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "Une valeur vide supprime l’attribut."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -8090,10 +8086,10 @@
 msgstr "<différent>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Modifier les valeurs ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -8102,5 +8098,5 @@
 msgstr[1] "Modifier les propriétés de {0} objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -8109,77 +8105,86 @@
 msgstr[1] "Cette action modifiera {0} objets."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Sélectionnez une clé"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Sélectionnez une valeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 msgid "Please select the objects you want to change properties for."
 msgstr "Sélectionnez les objets dont vous voulez modifier les propriétés."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Propriétés/Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Afficher les propriétés de la sélection"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Membre de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr "Position"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriétés : {0} / Appartenances : {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Propriétés / Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Modifier la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Supprimer de la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Voulez-vous vraiment supprimer la sélection de la relation {0} ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Supprimer la clé sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Supprimer des propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Ajouter une nouvelle paire clé / valeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Modifier la valeur de la clé sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Afficher les propriétés de la sélection"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "Sélectionner une relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "Sélectionner une relation dans la sélection principale."
@@ -8956,5 +8961,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9621,5 +9626,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -12028,13 +12033,13 @@
 msgstr "Récupération des informations de l’utilisateur..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Paramètres avancées"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Configuration directe des préférences. À utiliser avec précaution !"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -12042,14 +12047,14 @@
 msgstr "Rechercher : "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "La valeur actuelle est par défaut."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "La valeur par défaut est \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
@@ -12057,5 +12062,16 @@
 "été utilisé)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Veuillez sélectionner la ligne à supprimer."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Entrez une nouvelle paire clé / valeur"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -12063,20 +12079,13 @@
 msgstr "Veuillez sélectionner la ligne à modifier."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Nouvelle valeur pour {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Veuillez sélectionner la ligne à supprimer."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Entrez une nouvelle paire clé / valeur"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Valeur"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12668,5 +12677,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Activer les valeurs par défauts"
@@ -13169,5 +13178,10 @@
 "Actuellement il est ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Impossible de lire la source des balises : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -13179,10 +13193,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr "Impossible de lire la source de préréglage du balisage : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -13195,5 +13209,5 @@
 "width=600>L'erreur est : [{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -13202,5 +13216,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -13212,5 +13226,5 @@
 "width=600>L'erreur est : {1}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -13219,9 +13233,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Trier le menu des pré-réglages"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Pré-réglages des attribus"
@@ -13677,5 +13691,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:954
 msgid "Add relation"
-msgstr ""
+msgstr "Ajouter la relation"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:975
@@ -13702,5 +13716,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 msgid "New relation"
-msgstr ""
+msgstr "Nouvelle relation"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1078
@@ -15305,5 +15319,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "Aucune description disponible"
@@ -15322,5 +15336,10 @@
 msgstr "Le dossier du greffon ''{0}'' ne contient pas de manifeste."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "(plus d’infos...)"
@@ -15783,5 +15802,5 @@
 "code JOSM ''{0}''. Le code utilisé par défaut est ''en''."
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -15893,4 +15912,28 @@
 "géométrie de la fenêtre depuis les préférences."
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Changer les propriétés"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Importer des images"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Télécharger une image non-géoréférencée"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Erreur pendant la création de la sauvegarde du calque supprimé : {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -16273,4 +16316,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr "Aligner les chemins"
@@ -16281,4 +16325,6 @@
 " or put the pivot on their common node.\n"
 msgstr ""
+"Veuillez sélectionner deux segments qui ne partage aucun nœud\n"
+" ou placer le pivot sur leur nœud commun.\n"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:79
@@ -16291,5 +16337,5 @@
 msgstr "Cet alignement produirait des nœuds à l'extérieur du monde.\n"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr "Je sui prêt"
@@ -16297,5 +16343,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr "Astuces pour les AlignWays"
@@ -16878,8 +16924,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "eau"
@@ -16940,6 +16986,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "adresse"
@@ -17449,6 +17495,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Calque vide"
@@ -17674,6 +17720,15 @@
 msgstr "Aucun calque GPX trouvé."
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Outils externes"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+#, fuzzy
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr "Le script enfant a retourné des données invalides."
 
@@ -17696,5 +17751,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr "Utiliser des scripts externes dans JOSM"
@@ -17953,13 +18008,19 @@
 "with [irs rectify] in subject."
 msgstr ""
+"Cette option crée un ajustement du calque IRS et un petit chemin sur celui-"
+"ci. Vous devez ajuster la position du calque WMS en premier.\n"
+"Le calque résultant devra être enregistré en fichier .osm et envoyé à Komzpa "
+"(me@komzpa.net) avec pour objet [irs rectify]."
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:70
 msgid "Zoom level was not enough to record an offset precisely"
 msgstr ""
+"Le niveau de zoom n'était pas suffisant pour enregistrer un décalage "
+"précisément"
 
 #. if there are none, create one
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:103
 msgid "IRS Adjustment Layer"
-msgstr ""
+msgstr "Calque d'ajustement IRS"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
@@ -18426,5 +18487,5 @@
 msgstr "Vous devez sélectionner au moins deux chemins."
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -19225,4 +19286,9 @@
 msgid "Enter weight values"
 msgstr "Entrez les valeurs du poids"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Nouvelle valeur pour {0}"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
@@ -21280,5 +21346,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "zone"
@@ -21415,140 +21481,146 @@
 msgstr "{0}…"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "{0} {1}% des traces GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr "Affiche la position actuelle dans la vidéo"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr "Importer une vidéo"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr "Synchroniser une vidéo avec une trace GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr "Supprimer une vidéo"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr "supprime la vidéo actuelle du calque"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr "jouer/pause"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Lecture/Pause"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr "démarre/pause la reproduction vidéo"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
 msgstr "recule"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr "recule de n secondes"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Aller en avant"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr "avance"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Avancer"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr "avance de n secondes"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr "plus rapide"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Accélérer"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr "reproduction plus rapide"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr "plus lent"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Ralentir"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr "reproduction plus lente"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+#, fuzzy
+msgid "Loop"
 msgstr "en boucle"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr "reproduit en boucles les n secondes autour de la position actuelle"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr "Garder centré"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr "suit l'icône de la vidéo automatiquement"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr "Afficher les sous-titres avec la vidéo"
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr "Durée du saut"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 msgid "Set the length of a jump"
 msgstr "Précise la durée du saut"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr "Saute la reproduction de x ms"
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr "Durée de la boucle"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr "Précise la durée de la boucle autour d'un point"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr "pas de des-entrelacement"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr "des-entrelacement en utilisant le doublement de ligne"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr "des-entrelacement en utilisant l'interpolation linéaire"
@@ -21566,4 +21638,8 @@
 msgid "play"
 msgstr "lecture"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
+msgstr "en boucle"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
@@ -21676,6 +21752,12 @@
 msgstr "Le nœud ''{0}'' est une jonction avec plus de 2 chemins connectés."
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Entrez une expression de recherche"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -21703,5 +21785,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Nom de la carte"
@@ -21712,6 +21794,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr "Obtenir les calques"
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Terrains de sport"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21742,5 +21825,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "URL du service WMS"
@@ -21880,5 +21963,5 @@
 "Cela peut amener à de mauvaises coordonnées."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21887,19 +21970,19 @@
 "« {0} »"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr "(désactivé)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Calque WMS ({0}), téléchargement automatique au zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Calque WMS ({0}), téléchargement au zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -21913,17 +21996,17 @@
 "vos<br>préférences.<br>Voulez-vous récupérer des tuiles WMS ?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "Oui, récupérer les images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "URL invalide ?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Télécharger les tuiles visibles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21931,33 +22014,33 @@
 "La zone demandée est trop grande. Prière de changer le zoom ou la résolution."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Changer la résolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Recharger les tuiles erronées"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Canal alpha"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Sauvegarder un calque WMS dans un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Sauvegarder le calque WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Charger un calque WMS depuis un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "Charger le calque WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -21966,30 +22049,30 @@
 "{1} attendue"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Erreur de format de fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Erreur lors du chargement du fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "Placer un marque-page WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Téléchargement automatique"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -21998,5 +22081,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -22006,73 +22089,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 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"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Préférences du greffon WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Modifier la liste des serveurs WMS affichée dans le menu WMS."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr "Ajouter une url de WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "Copier le(s) réglage(s) par défaut sélectionné(s)"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "Veuillez sélectionner au moins une ligne à copier."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "Outil de téléchargement :"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "Tuiles se chevauchant"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "% de l’Est :"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "% du Nord :"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr "Connexions simultanées"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Nom de la carte (par défaut)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "URL du service WMS (par défaut)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr "Ajouter une url de WMS"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "Copier le(s) réglage(s) par défaut sélectionné(s)"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "Veuillez sélectionner au moins une ligne à copier."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "Outil de téléchargement :"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "Tuiles se chevauchant"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "% de l’Est :"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "% du Nord :"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr "Connexions simultanées"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Supprimer"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -22141,5 +22235,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "forêt"
@@ -22433,6 +22527,12 @@
 msgstr "Saturation :"
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -22445,15 +22545,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr "Outils pour dessiner des bâtiments."
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr "Prise en charge du serveur WMS du cadastre français."
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -22470,10 +22570,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "Crée un réseau de chemins."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -22482,5 +22582,5 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
@@ -22488,5 +22588,5 @@
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -22495,15 +22595,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr "Téléchargements de données OSM le long du chemin"
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "Chemins dupliqués avec un décalage"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -22514,5 +22614,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
@@ -22521,15 +22621,15 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr "Visualise les informations comme un calque de calcul d’itinéraire."
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "Fournir un calque d’arrière plan en affichant une grille"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -22542,15 +22642,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "Aide à vectoriser des images WMS."
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -22560,5 +22660,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -22571,5 +22671,5 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
@@ -22578,10 +22678,10 @@
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr "Convertir une aire en multipolygone"
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -22592,5 +22692,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -22602,20 +22702,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "Affiche une image d’arrière plan provenant d’OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importe les erreurs d’OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -22625,5 +22725,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -22631,5 +22731,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -22640,5 +22740,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -22649,10 +22749,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Ajoute le thème JGoodies."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -22661,15 +22761,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Permet à d’autres applications d’envoyer des commandes vers JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr "Greffon pour annuler des groupes de modifications"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -22679,5 +22779,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -22689,10 +22789,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Fournit des capacités de calcul d’itinéraire."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -22701,5 +22801,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -22709,16 +22809,31 @@
 "carte glissante en tâche de fond et demander des mises à jour."
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "Informations sur le greffon"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permet d’ajouter des marqueurs/points sur les positions GPS."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Ouvre une fenêtre de modification des attributs sous forme de table."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22731,15 +22846,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "Créer des maisons mitoyennes depuis des blocs entiers."
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22748,5 +22863,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22757,5 +22872,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22766,10 +22881,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr "Authoriser la restauration de l'objet depuis la base de donnée OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22780,5 +22895,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22788,5 +22903,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22797,20 +22912,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Facilite le téléchargement le long de plusieurs chemins interconnectés"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr "Active la recherche de points importés à partir d'un fichier gpx"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Sélectionne une séquence de chemins connectés non-ramifiés"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22820,5 +22935,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -23713,4 +23828,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -23718,5 +23877,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "rond-point"
@@ -24223,5 +24382,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "rue résidentiel"
@@ -24270,5 +24429,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "voie d’accès"
@@ -24301,6 +24460,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "construction"
@@ -25459,5 +25618,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "marais"
@@ -25655,7 +25814,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "vélo"
@@ -25931,8 +26090,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "par rail"
@@ -27368,5 +27527,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "aérogare"
@@ -28639,32 +28798,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "terrain de sport"
@@ -30462,9 +30655,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "vert"
@@ -32127,5 +32320,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "métro"
@@ -32406,5 +32599,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32422,5 +32615,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "déprécié"
@@ -32797,7 +32990,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "piste"
@@ -32889,9 +33082,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "aire de repos"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32901,5 +33102,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "gué"
@@ -32918,7 +33119,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "piste"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "rond-point interne"
@@ -32933,5 +33147,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr "point d’accès d’urgence"
@@ -32945,5 +33159,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "lit d’un fleuve/d’une rivière"
@@ -32957,5 +33171,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "ruisseau"
@@ -32969,5 +33183,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "dock"
@@ -33171,14 +33385,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "artificiel"
@@ -33192,5 +33406,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr "rapides"
@@ -33252,7 +33466,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "gare/arrêt ferroviaire"
@@ -33275,10 +33489,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "autre voie ferrée"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "autre voie ferrée"
@@ -33312,7 +33526,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "ligne ferroviaire touristique"
@@ -33357,6 +33571,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "aéroport"
@@ -33378,5 +33592,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "héliport"
@@ -33390,5 +33604,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "aire de stationnement pour avions"
@@ -33466,8 +33680,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "transport aérien par câble"
@@ -33483,5 +33697,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "piste de ski bleue"
@@ -33495,5 +33709,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "piste de ski rouge"
@@ -33507,5 +33721,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "piste de ski noire"
@@ -33519,5 +33733,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr "piste de ski orange"
@@ -33531,5 +33745,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "piste de ski hors piste"
@@ -33543,5 +33757,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "piste de ski verte"
@@ -33661,11 +33875,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "alimentation électrique"
@@ -33678,5 +33892,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "jetée/ponton"
@@ -33690,5 +33904,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "canalisation"
@@ -33832,13 +34046,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "loisir"
@@ -33852,5 +34066,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "port"
@@ -33946,10 +34160,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "équipement"
@@ -34059,11 +34273,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "équipement de circulation"
@@ -34501,24 +34715,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "balise lumineuse"
@@ -34550,6 +34764,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "fontaine/eau potable"
@@ -34610,8 +34824,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "santé"
@@ -34972,26 +35186,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "magasin"
@@ -35063,8 +35277,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hôtel"
@@ -35164,9 +35378,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "tourisme"
@@ -35254,9 +35468,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "patrimoine"
@@ -35269,5 +35483,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "carrière"
@@ -35281,5 +35495,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "décharge"
@@ -35301,5 +35515,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "bassin"
@@ -35313,5 +35527,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "cour de ferme"
@@ -35334,5 +35548,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "commerce"
@@ -35346,5 +35560,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "zone industrielle"
@@ -35358,5 +35572,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "terrain vague"
@@ -35370,5 +35584,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "zone d’aménagement"
@@ -35382,5 +35596,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "zone ferroviaire"
@@ -35437,7 +35651,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "terrain militaire"
@@ -35451,5 +35665,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "cimetière"
@@ -35462,5 +35676,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "sommet"
@@ -35475,5 +35689,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "glacier"
@@ -35487,5 +35701,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "volcan"
@@ -35539,8 +35753,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "nature"
@@ -35554,5 +35768,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "broussailles"
@@ -35566,5 +35780,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "lande"
@@ -35578,5 +35792,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "Zone forestière"
@@ -35590,5 +35804,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "terrain boueux"
@@ -35602,5 +35816,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "plage"
@@ -35678,8 +35892,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "itinéraire"
@@ -35768,12 +35982,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "frontière"
@@ -35923,11 +36137,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "lieu"
@@ -35941,5 +36155,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr "données TIGER"
@@ -36308,4 +36522,60 @@
 msgstr "PCN 2006 - Italie"
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr ""
+#~ "Seulement deux aires au maximum peuvent être jointes pour le moment."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "A fusionné une aire superposée sur elle-même"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Entrer des valeurs pour tous les conflits."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Résoudre les conflits"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Joindre les aires : supprimer les chemins courts"
+
+#~ msgid "Closed Way"
+#~ msgstr "Chemin fermé"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr ""
+#~ "Erreur : ligne ''{0}'' inattendue dans le fichier des marque-pages du "
+#~ "serveur"
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr ""
+#~ "Erreur : valeur double erronée ''{0}'' à la ligne ''{1}'' dans la liste "
+#~ "des marque-pages du serveur"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Le chargement des marque-pages depuis ''{0}'' a échoué pour des raisons "
+#~ "de sécurité. Exception : {1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>Le marque-page ne peut être écrit.<br>{0}</html>"
+
+#~ msgid "play/pause"
+#~ msgstr "jouer/pause"
+
+#~ msgid "forward"
+#~ msgstr "avance"
+
+#~ msgid "faster"
+#~ msgstr "plus rapide"
+
+#~ msgid "slower"
+#~ msgstr "plus lent"
+
+#~ msgid "Get Layers"
+#~ msgstr "Obtenir les calques"
+
 #~ msgid "Move"
 #~ msgstr "Déplacer"
@@ -36741,7 +37011,4 @@
 #~ msgid "bicyclemap"
 #~ msgstr "carte de randonnée cycliste"
-
-#~ msgid "Split way segment"
-#~ msgstr "Séparer le segment du chemin"
 
 #~ msgid "Include your steps to get to the error (as detailed as possible)!"
@@ -37376,7 +37643,4 @@
 #~ "{1}, valeur {2}"
 
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Erreur de nombre de paramètre pour une opération sur des nœuds."
-
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
Index: /applications/editors/josm/i18n/po/gl.po
===================================================================
--- /applications/editors/josm/i18n/po/gl.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/gl.po	(revision 23252)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
 "PO-Revision-Date: 2010-09-02 21:42+0000\n"
 "Last-Translator: Dario <dario.villar.v@gmail.com>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:54+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -235,5 +235,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -255,5 +254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -275,7 +274,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -397,5 +397,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -422,4 +422,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -427,5 +428,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -460,5 +461,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Información"
@@ -672,8 +673,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -685,5 +686,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Borrar"
@@ -861,14 +862,14 @@
 msgstr "Sair da aplicación,"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Vista de Pantalla Completa"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Alternar a vista de pantalla completa"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Alternar a vista de pantalla completa"
@@ -911,26 +912,22 @@
 msgstr "Amosa información do obxecto sobre nodos,vias ou relacions de OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Unir áreas superpostas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Une áreas que se superpoñen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "Por favor escolle ao menos unha via pechada que deberia ser unida."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Só ata 2 áreas poden ser unidas a un tempo"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" non esta pechada e polo tanto non pode ser unido"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -942,5 +939,5 @@
 "As vias seleccionadas só teñen nodos fora da rexión de datos descargados"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -948,37 +945,67 @@
 msgstr "Esto pode levar a un borrado accidental dos nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Esta seguro de continuar?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Por favor aborte se non esta segura"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Nada interesante foi atopado. Nada foi cambiado..."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Lendo conxunto de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Borrando nodos duplicados..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Engadir nodo en todas as interseccións"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Eliminiar vías que non formen parte de un multipolígono interior"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Arranxar relacións"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Areas auto-superpostas unidas"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Areas superpostas unidas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -988,33 +1015,22 @@
 "verifique que non se introduciron erros."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Introducir valores para todos os conflitos."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Resolver Conflitos"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Arranxar conflictos de etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Separar segmento de vía"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Elementos borrados das Relacions"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Une Areas: Borra Vías"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Vía Pechada"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Eliminar etiquetas de vías internas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Función de unor áreas"
@@ -1547,12 +1563,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1573,6 +1588,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1607,6 +1622,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Erro"
@@ -1638,5 +1653,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1751,5 +1766,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Pechar"
@@ -1775,5 +1790,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Non, abortar"
@@ -1805,5 +1820,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -2002,10 +2017,10 @@
 msgstr "Despegar Nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Convertir en {0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2413,4 +2428,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2562,17 +2578,17 @@
 msgstr[1] "Engadir e mover un novo nodo virtual a {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Mover elementos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Movelos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Desfacer mover"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2585,9 +2601,9 @@
 "Desexa desplazalos realmente?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Soltar o botón do rato para escoller os obxectos do rectángulo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2596,9 +2612,9 @@
 "próximo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Soltar o botón do rato para deter a rotación."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3091,4 +3107,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3484,5 +3501,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Novo valor"
@@ -3555,15 +3571,15 @@
 msgstr "Valor de lonxitude ilegal valor \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Atencion:fallou ao gardar preferencia para \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, 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:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3574,5 +3590,5 @@
 "non é un directorio."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3583,5 +3599,5 @@
 "\"{0}\" non é un directorio.<html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3592,5 +3608,5 @@
 "de preferencias desaparecido {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3601,5 +3617,5 @@
 "directorio de preferencias desaparecido {0}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3609,5 +3625,5 @@
 "arquivo de preferencias por defecto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3618,5 +3634,5 @@
 "preferencias por defecto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3627,5 +3643,5 @@
 "de preferencias por defecto :{0}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3637,5 +3653,5 @@
 "defecto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3645,17 +3661,4 @@
 "Atencion: Fallou ao iniciar as preferencias. Fallou ao restablecer o arquivo "
 "de preferencias ao arquivo por defecto :{0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Erro: Liña \"{0}\" inesperada no arquivo de marcador \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Erro: Dobre valor ilegal \"{0}\" na liña \"{1}\" no arquivo de marcadores "
-"\"{2}\""
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3672,27 +3675,4 @@
 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:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr "Erro: Liña inesperada \"{0}\" na lista de marcadores do servidor"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-"Erro: Dobre valor ilegal \"{0}\" na liña \"{1}\" na  lista de marcadores do "
-"servidor"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"Fallou ao cargar os  marcadores de \"{0}\" por motivos de seguridade. A "
-"Excepción foi: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4118,5 +4098,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "Número de parámetros incorrecto para o operador nodes."
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Erro creando directorio caché: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Erro: Liña \"{0}\" inesperada no arquivo de marcador \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Erro: Dobre valor ilegal \"{0}\" na liña \"{1}\" no arquivo de marcadores "
+"\"{2}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
@@ -4124,9 +4127,4 @@
 "<html> Non se poden ler os marcadores dende <br>\"{0}\"<br>O erro foi: {1}</"
 "html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>Non se puido escribir no marcador.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4245,5 +4243,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "construcción"
@@ -4419,10 +4417,10 @@
 msgstr "Si se especifica, reestablecer a configuración en lugar de lela."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Nome de usuario"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4601,8 +4599,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4831,5 +4829,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5402,9 +5400,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5417,9 +5415,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5506,5 +5503,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "ningún"
@@ -5821,5 +5818,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5927,11 +5924,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Engadir"
@@ -6278,10 +6275,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "Escoller na lista de relacións"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "Escoller relación an lista de relacións."
@@ -7971,9 +7968,9 @@
 msgstr "Esta petición de conxunto de cambios é inválida"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Engadir Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7982,13 +7979,13 @@
 msgstr[1] "Modificaranse {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "Un valor vacío borra o atributo."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7996,10 +7993,10 @@
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Cambiar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -8008,5 +8005,5 @@
 msgstr[1] "Cambiar as propiedades de ata {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -8015,78 +8012,87 @@
 msgstr[1] "Esto cambiará ata {0} obxectos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Por favor, selecciona unha tecla"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Por favor selecciona un valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 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/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Propiedades/Relacións"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Propiedades dos obxectos seleccionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Membro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr "Posición"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Borrar da relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Borrar realmente a selección da relación {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Borrar a clave seleccionada en todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Borrar Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Engadir un novo par clave/valor para todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar o valor da clave seleccionada para todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Propiedades dos obxectos seleccionados."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "Escoller relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "Escoller relación na selección principal"
@@ -8818,5 +8824,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9426,5 +9432,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11575,13 +11581,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Preferencias avanzadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Establecemento directo de entradas de preferencia. Usar con coidado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11589,19 +11595,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "O valor actual é o predeterminado."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "O valor predeterminado é \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
 "O valor predeterminado aínda descoñecido (o parámetro non se usou ainda)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Por favor seleccione a fila a borrar."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Introduce un novo par clave/valor."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11609,20 +11626,13 @@
 msgstr "Por favor selecciona a fila a editar."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Novo valor para {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Por favor seleccione a fila a borrar."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Introduce un novo par clave/valor."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Valor"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12209,5 +12219,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Activar os valores predeterminados incorporadas"
@@ -12679,5 +12689,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12687,10 +12702,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12700,5 +12715,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12707,5 +12722,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12714,5 +12729,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12721,9 +12736,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Ordenar o menú de elementos preestablecidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Axustes de etiquetado preestablecidos."
@@ -14654,5 +14669,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "sen descripción dispoñible"
@@ -14671,5 +14686,10 @@
 msgstr "O arquivo do complemento \"{0}\" non incúe un Manifesto."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "Mais información..."
@@ -15042,5 +15062,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -15137,4 +15157,28 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Cambiar Propiedades"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Importar imaxes"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Imaxes Importadas"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Erro durante a carga da páxina {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15494,4 +15538,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15512,5 +15557,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15518,5 +15563,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -16009,8 +16054,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "auga"
@@ -16071,6 +16116,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "enderezo"
@@ -16539,6 +16584,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr ""
@@ -16758,6 +16803,14 @@
 msgstr "Non se atopou capa de datos GPX"
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Erro interno do servidor"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16780,5 +16833,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17487,5 +17540,5 @@
 msgstr "Debes escoller al menos dúas vías."
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr ""
@@ -18257,4 +18310,9 @@
 msgstr ""
 
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Novo valor para {0}"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
@@ -20211,5 +20269,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr ""
@@ -20345,140 +20403,145 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Reproducción/Pausa"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Atrás"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Saltar cara adiante"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Avance"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Máis rápido"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Máis lento"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20495,4 +20558,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20589,6 +20656,12 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Introduce a expresion de búsqueda"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20616,5 +20689,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Nome do menú"
@@ -20625,6 +20698,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Instalaciones deportivas"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20655,5 +20729,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "WMS URL"
@@ -20785,24 +20859,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20813,80 +20887,80 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Gardar capa WMS nun ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Cargar capa WMS dende ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Versión de ficheiro WMS non soportado; atopouse {0}, esperabase {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Erro de Formato de Ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Erro cargando ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20895,5 +20969,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20903,73 +20977,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 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"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "Copiar a/as escolla/s por defecto"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "Escolla polo menos unha fila para copiar"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "Xestor de descarga:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "Superposición de teselas"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "% cara o Leste"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "% cara o Norte"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Nome de Menú (Predeterminado)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "URL WMS (Predeterminada)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "Copiar a/as escolla/s por defecto"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "Escolla polo menos unha fila para copiar"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "Xestor de descarga:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "Superposición de teselas"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "% cara o Leste"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "% cara o Norte"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Eliminar"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21034,5 +21119,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "plantación forestal"
@@ -21326,6 +21411,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -21335,15 +21426,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr "Ferramentas para debuxar edificios."
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -21355,10 +21446,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "Crea unha cuadrícula de vias."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -21366,5 +21457,5 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
@@ -21372,5 +21463,5 @@
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21379,15 +21470,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "Duplica Vías con un desplazamento"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21396,20 +21487,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21419,15 +21510,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "Axuda a vectorizar imaxes WMS."
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21435,5 +21526,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21443,15 +21534,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "Non engade ningún xiro á esquerda para conxuntos de 4 ou 5 vías"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr "Coinvirte de forma sinxela un área a un multipolígono."
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21462,5 +21553,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21474,15 +21565,15 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "Amosa unha imaxe OpenLayer de fondo"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
@@ -21490,5 +21581,5 @@
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21497,5 +21588,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21505,5 +21596,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21515,5 +21606,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21524,10 +21615,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "O gran JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21537,15 +21628,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Permitir outras aplicacións enviar ordes a JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr "Complemento para desfacer conxuntos de cambios"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21559,5 +21650,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21569,10 +21660,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Proporciona capacidades de enrutamento."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21584,5 +21675,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21592,11 +21683,26 @@
 "mapa desplazable e solicitar actualizacións."
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "Información do complemento"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permite engadir marcadores/nodos ás posicións GPS actuais."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
@@ -21605,5 +21711,5 @@
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21616,15 +21722,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "Crea edificion entre medianeras a partires de bloques únicos"
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21635,5 +21741,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21644,5 +21750,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21653,10 +21759,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr "Permite desfacer o borrado de obxetos da base de datos de OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21667,5 +21773,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21675,5 +21781,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21684,5 +21790,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -21690,15 +21796,15 @@
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Escolle unha secuencia de vías conectadas non ramificadas"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21709,5 +21815,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22603,4 +22709,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22608,5 +22758,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "rotonda"
@@ -23113,5 +23263,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "rúa urbana"
@@ -23160,5 +23310,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "vía de servicio"
@@ -23191,6 +23341,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "en construcción"
@@ -24349,5 +24499,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "marísma"
@@ -24545,7 +24695,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "bicicleta"
@@ -24821,8 +24971,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "ferrocarril"
@@ -26258,5 +26408,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "terminal"
@@ -27529,32 +27679,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "deporte"
@@ -29351,9 +29535,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "verde"
@@ -31016,5 +31200,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "metro"
@@ -31295,5 +31479,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31311,5 +31495,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "obsoleto"
@@ -31686,7 +31870,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "pista"
@@ -31778,9 +31962,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "servizos"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31790,5 +31982,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "vado"
@@ -31807,7 +31999,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "pista"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "círculo de xiro"
@@ -31822,5 +32027,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr "Punto de acceso de emerxencias"
@@ -31834,5 +32039,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "ribeira"
@@ -31846,5 +32051,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "fluxo"
@@ -31858,5 +32063,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "muelle"
@@ -32060,14 +32265,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "feito polo home"
@@ -32081,5 +32286,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr "rápidos"
@@ -32141,7 +32346,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "punto ferroviario"
@@ -32164,10 +32369,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "outros ferrocarriles"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "paso con mais dun cruce ferroviario"
@@ -32201,7 +32406,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "vía morta"
@@ -32246,6 +32451,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "aerovía"
@@ -32267,5 +32472,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "pista (oscuro)"
@@ -32279,5 +32484,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "pista (claro)"
@@ -32355,8 +32560,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "pista de rodadura"
@@ -32372,5 +32577,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "pista fácil"
@@ -32384,5 +32589,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "pista intermedia"
@@ -32396,5 +32601,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "pista avanzada"
@@ -32408,5 +32613,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr "pista para expertos"
@@ -32420,5 +32625,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "pista de estilo libre"
@@ -32432,5 +32637,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "pista para iniciados"
@@ -32550,11 +32755,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "enerxía"
@@ -32567,5 +32772,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "porto"
@@ -32579,5 +32784,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "tubería"
@@ -32721,13 +32926,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "ocio"
@@ -32741,5 +32946,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "porto deportivo"
@@ -32835,10 +33040,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "servizos"
@@ -32948,11 +33153,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "tráfico de ocio"
@@ -33390,24 +33595,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "equipamento lumínico"
@@ -33439,6 +33644,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "auga (claro)"
@@ -33499,8 +33704,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "saúde"
@@ -33861,26 +34066,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "tenda"
@@ -33952,8 +34157,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hotel"
@@ -34053,9 +34258,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "turismo"
@@ -34143,9 +34348,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "patrimonio histórico"
@@ -34158,5 +34363,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "canteira"
@@ -34170,5 +34375,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "vertedoiro"
@@ -34190,5 +34395,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "cunca"
@@ -34202,5 +34407,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "edificio agrario"
@@ -34223,5 +34428,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "venta ao por menor"
@@ -34235,5 +34440,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "industrial"
@@ -34247,5 +34452,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "área postindustrial degradada"
@@ -34259,5 +34464,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "zona verde"
@@ -34271,5 +34476,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "zona ferroviaria"
@@ -34326,7 +34531,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "zona militar"
@@ -34340,5 +34545,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "cemiterio"
@@ -34351,5 +34556,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "pico"
@@ -34364,5 +34569,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "glaciar"
@@ -34376,5 +34581,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "volcán"
@@ -34428,8 +34633,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "espazo natural"
@@ -34443,5 +34648,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "matorral"
@@ -34455,5 +34660,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "monte"
@@ -34467,5 +34672,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "área forestal"
@@ -34479,5 +34684,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "lodazal"
@@ -34491,5 +34696,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "praia"
@@ -34567,8 +34772,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "ruta"
@@ -34657,12 +34862,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "fronteira"
@@ -34812,11 +35017,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "lugar"
@@ -34830,5 +35035,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr "datos_TIGER"
@@ -35197,4 +35402,42 @@
 msgstr ""
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Só ata 2 áreas poden ser unidas a un tempo"
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Areas auto-superpostas unidas"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Introducir valores para todos os conflitos."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Resolver Conflitos"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Une Areas: Borra Vías"
+
+#~ msgid "Closed Way"
+#~ msgstr "Vía Pechada"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr "Erro: Liña inesperada \"{0}\" na lista de marcadores do servidor"
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr ""
+#~ "Erro: Dobre valor ilegal \"{0}\" na liña \"{1}\" na  lista de marcadores "
+#~ "do servidor"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Fallou ao cargar os  marcadores de \"{0}\" por motivos de seguridade. A "
+#~ "Excepción foi: {1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>Non se puido escribir no marcador.<br>{0}</html>"
+
 #~ msgid "Be sure to include the following information:"
 #~ msgstr "Asegúrate de incluir a seguinte información:"
@@ -35558,7 +35801,4 @@
 #~ 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"
@@ -35655,7 +35895,4 @@
 #~ msgid "Conflicting relation"
 #~ msgstr "Relación contradictoria"
-
-#~ msgid "Split way segment"
-#~ msgstr "Separar segmento de vía"
 
 #~ msgid "Move"
@@ -35818,7 +36055,4 @@
 #~ msgstr "A primitiva xa foi borrada"
 
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Número de parámetros incorrecto para o operador nodes."
-
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
Index: /applications/editors/josm/i18n/po/he.po
===================================================================
--- /applications/editors/josm/i18n/po/he.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/he.po	(revision 23252)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
 "PO-Revision-Date: 2010-09-06 01:04+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -232,5 +232,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -252,5 +251,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -272,7 +271,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -393,5 +393,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -418,4 +418,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -423,5 +424,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -456,5 +457,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "מידע"
@@ -663,8 +664,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -676,5 +677,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "מחק"
@@ -850,14 +851,14 @@
 msgstr "צא מהיישום."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "תצוגת מסך מלא"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr ""
@@ -900,26 +901,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "אחד שטחים חופפים"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "מאחד שטחים חופפים זה לזה"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -930,5 +927,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -936,37 +933,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "בטל אם אינך בטוח"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+msgid "Reverting changes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "מוריד נקודות כפולות..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "חבר אזורים חופפים"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -974,33 +1000,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "הזן ערכים לכל ההתנגשויות."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "פתור התנגשויות"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "פצל קטע דרך"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr ""
@@ -1501,12 +1516,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1527,6 +1541,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1561,6 +1575,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "שגיאה"
@@ -1592,5 +1606,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1702,5 +1716,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "סגור"
@@ -1726,5 +1740,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr ""
@@ -1756,5 +1770,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1934,10 +1948,10 @@
 msgstr "הפרד נקודה"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2332,4 +2346,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2478,17 +2493,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2498,9 +2513,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "שחרר את לחצן העכבר לבחירת פריטים במרובע."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2508,9 +2523,9 @@
 "שחרר את לחצן העכבר הימני להפסקת ההזזה. Ctrl למיזוג עם הצומת הקרוב ביותר."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "שחרר את סמן העכבר להפסקת ההטייה"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2968,4 +2983,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3349,5 +3365,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "ערך חדש"
@@ -3420,15 +3435,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "קובץ תצורה לא תקין בשורות {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3437,5 +3452,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3444,5 +3459,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3451,5 +3466,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3458,5 +3473,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3464,5 +3479,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3471,5 +3486,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3478,5 +3493,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3485,20 +3500,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
 "Warning: Failed to initialize preferences.Failed to reset preference file to "
 "default: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 msgstr ""
 
@@ -3516,23 +3520,4 @@
 msgid "Could not load preferences from server."
 msgstr "לא יכול לטעון מאפיינים משרת."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -3940,12 +3925,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "מספר שגוי של פרמטרים עבור פעולה על נקודה."
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "שגיאה ביצירת ספריית מטמון: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, 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:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
 msgstr ""
 
@@ -4065,5 +4066,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "בניין"
@@ -4239,10 +4240,10 @@
 msgstr "במידה וצויין, אפס את התצורה במקום לקרוא אותה."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "שם משתמש"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4413,8 +4414,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4632,5 +4633,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5169,9 +5170,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5184,9 +5185,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5272,5 +5272,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "כלום"
@@ -5558,5 +5558,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5654,11 +5654,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "הוסף"
@@ -6003,10 +6003,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr ""
@@ -7655,9 +7655,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "הוסף תכונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7666,13 +7666,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7680,10 +7680,10 @@
 msgstr "<שונה>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "לשנות ערכים?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7692,5 +7692,5 @@
 msgstr[1] "שנה תכונות של עד {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7699,77 +7699,86 @@
 msgstr[1] "זה ישנה עד {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "נא בחר מפתח"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "נא בחר ערך"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 msgid "Please select the objects you want to change properties for."
 msgstr "בחר את העצמים שאתה רוצה לשנות את תכונותיהם."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "תכונות\\חברויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "תכונות לעצמים שנבחרו."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "חבר ב"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "תכונות: {0} \\ חברויות: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "תכונות \\ חברויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "שנה יחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "מחק מיחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "באמת מחק את הבחירה מהיחס {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "מחק את המפתח הנבחר בכל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "מחק מאפיינים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "הוסף מצד מפתח/ערך לכל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "תכונות לעצמים שנבחרו."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr ""
@@ -8496,5 +8505,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9082,5 +9091,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11231,13 +11240,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "מאפיינים מתקדמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "קביעת ישירה של כניסות מאפיינים. השתמש בזהירות!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11245,18 +11254,29 @@
 msgstr "חפש: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "ערך נוכחי הינו ברירת מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "ערך ברירת המחדל הוא \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr "ערכי ברירת מחדל לא ידועים ברגע זה (קביעה לא היתה עדיין בשימוש)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "נא בחר את השורה למחיקה."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "הכנס צמד מפתח\\ערך חדש"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11264,20 +11284,13 @@
 msgstr "נא בחר את השורה לעריכה."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "ערך חדש עבור {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "נא בחר את השורה למחיקה."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "הכנס צמד מפתח\\ערך חדש"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "ערך"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -11826,5 +11839,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "אפשר ברירות מחדל מובנות"
@@ -12292,5 +12305,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12300,10 +12318,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12313,5 +12331,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12320,5 +12338,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12327,5 +12345,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12334,9 +12352,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr ""
@@ -14197,5 +14215,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "אין תיאור זמין"
@@ -14212,5 +14230,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr ""
@@ -14579,5 +14602,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -14673,4 +14696,28 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "שנה תכונות"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "ייבא תמונות"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "תמונות מיובאות"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "שגיאה בעת טעינת העמוד {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15029,4 +15076,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15047,5 +15095,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15053,5 +15101,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -15536,8 +15584,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "מים"
@@ -15598,6 +15646,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "כתובת"
@@ -16060,6 +16108,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "שכבה ריקה"
@@ -16277,6 +16325,13 @@
 msgstr "לא נמצאה שכבת נתוני GPX"
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+msgid "External tool error"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16299,5 +16354,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17005,5 +17060,5 @@
 msgstr ""
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr ""
@@ -17774,4 +17829,9 @@
 msgid "Enter weight values"
 msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "ערך חדש עבור {0}"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
@@ -19709,5 +19769,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "שטח"
@@ -19843,140 +19903,145 @@
 msgstr "{0},..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "נגן\\השהה"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "חזרה"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "קפוץ הלאה"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "העבר"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "מהר יותר"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "לאט יותר"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -19993,4 +20058,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20087,6 +20156,12 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "ביטוי רגולרי"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20114,5 +20189,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "שם תפריט"
@@ -20123,6 +20198,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "מתקני ספורט"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20153,5 +20229,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "כתובת WMS"
@@ -20283,24 +20359,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20311,80 +20387,80 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "הורד משטחים גלויים"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "שנה רזולוציה"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "טען מחדש משטחים פגומים"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "שמור שכבת WMS לקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "טען שכבת WMS מקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "שגיאה בפורמט קובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "שגיאה בטעינת קובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "הורדה אוטומטית"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20393,5 +20469,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20401,73 +20477,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "פתח שכבת WMS ריקה לטעינת נתונים מקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "מאפייני תוסף WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "מיקוד"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "שם תפריט (ברירת מחדל)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "כתובת WMS (ברירת מחדל)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "הסר"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20532,5 +20619,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "יער"
@@ -20824,6 +20911,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -20833,15 +20926,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr ""
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -20853,10 +20946,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -20864,10 +20957,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -20876,15 +20969,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -20893,20 +20986,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -20916,15 +21009,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -20932,5 +21025,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -20940,15 +21033,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -20957,5 +21050,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -20965,20 +21058,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20986,5 +21079,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20992,5 +21085,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20999,5 +21092,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21006,10 +21099,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21017,15 +21110,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21035,5 +21128,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21042,10 +21135,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21054,5 +21147,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21060,16 +21153,30 @@
 msgstr ""
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+msgid "Plugin for Seamap Editor"
+msgstr ""
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21079,15 +21186,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21096,5 +21203,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21103,5 +21210,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21110,10 +21217,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21122,5 +21229,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21130,5 +21237,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21137,20 +21244,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21159,5 +21266,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22051,4 +22158,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22056,5 +22207,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "כיכר"
@@ -22561,5 +22712,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "מגורים"
@@ -22608,5 +22759,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "שירות"
@@ -22639,6 +22790,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "בנייה"
@@ -23797,5 +23948,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "ביצה"
@@ -23993,7 +24144,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "אופניים"
@@ -24269,8 +24420,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr ""
@@ -25706,5 +25857,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "מסוף"
@@ -26977,32 +27128,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "ספורט"
@@ -28799,9 +28984,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "ירוק"
@@ -30464,5 +30649,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "רכבת תחתית"
@@ -30743,5 +30928,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -30759,5 +30944,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "מיושן"
@@ -31134,7 +31319,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr ""
@@ -31226,9 +31411,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr ""
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31238,5 +31431,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr ""
@@ -31255,7 +31448,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "כביש ראשי"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr ""
@@ -31270,5 +31476,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr ""
@@ -31282,5 +31488,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "גדת נחל"
@@ -31294,5 +31500,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "זרם"
@@ -31306,5 +31512,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr ""
@@ -31508,14 +31714,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "מעשה אדם"
@@ -31529,5 +31735,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -31589,7 +31795,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr ""
@@ -31612,10 +31818,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr ""
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr ""
@@ -31649,7 +31855,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr ""
@@ -31694,6 +31900,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr ""
@@ -31715,5 +31921,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr ""
@@ -31727,5 +31933,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr ""
@@ -31803,8 +32009,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr ""
@@ -31820,5 +32026,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "מסלול קל"
@@ -31832,5 +32038,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "מסלול בינוניים"
@@ -31844,5 +32050,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "מסלול מתקדמים"
@@ -31856,5 +32062,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr ""
@@ -31868,5 +32074,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr ""
@@ -31880,5 +32086,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "מסלול מתחילים"
@@ -31998,11 +32204,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "תחנת כח"
@@ -32015,5 +32221,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "מזח"
@@ -32027,5 +32233,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "צינור"
@@ -32169,13 +32375,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "פנאי"
@@ -32189,5 +32395,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr ""
@@ -32283,10 +32489,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr ""
@@ -32396,11 +32602,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr ""
@@ -32838,24 +33044,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr ""
@@ -32887,6 +33093,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr ""
@@ -32947,8 +33153,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "בריאות"
@@ -33309,26 +33515,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "חנות"
@@ -33400,8 +33606,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "מלון"
@@ -33501,9 +33707,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "תיירות"
@@ -33591,9 +33797,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "היסטורי"
@@ -33606,5 +33812,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "מחצבה"
@@ -33618,5 +33824,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr ""
@@ -33638,5 +33844,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr ""
@@ -33650,5 +33856,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr ""
@@ -33671,5 +33877,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "קמעוני"
@@ -33683,5 +33889,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "תעשייתי"
@@ -33695,5 +33901,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr ""
@@ -33707,5 +33913,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr ""
@@ -33719,5 +33925,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr ""
@@ -33774,7 +33980,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "צבאי"
@@ -33788,5 +33994,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "בית עלמין"
@@ -33799,5 +34005,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "פיסגה"
@@ -33812,5 +34018,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "קרחון"
@@ -33824,5 +34030,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "הר געש"
@@ -33876,8 +34082,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "טבעי"
@@ -33891,5 +34097,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr ""
@@ -33903,5 +34109,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr ""
@@ -33915,5 +34121,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr ""
@@ -33927,5 +34133,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "בוץ"
@@ -33939,5 +34145,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "חוף"
@@ -34015,8 +34221,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr ""
@@ -34105,12 +34311,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "גבול"
@@ -34260,11 +34466,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "מקום"
@@ -34278,5 +34484,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -34645,4 +34851,10 @@
 msgstr ""
 
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "הזן ערכים לכל ההתנגשויות."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "פתור התנגשויות"
+
 #~ msgid "Move"
 #~ msgstr "הזז"
@@ -34754,7 +34966,4 @@
 #~ msgid "JOSM Online Help"
 #~ msgstr "עזרה מקוונת עבור JOSM"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "שגיאה בעת טעינת העמוד {0}"
 
 #~ msgid ""
@@ -34918,7 +35127,4 @@
 #~ msgid "false"
 #~ msgstr "שקר"
-
-#~ msgid "Split way segment"
-#~ msgstr "פצל קטע דרך"
 
 #~ msgid "Degrees Minutes Seconds"
@@ -35249,7 +35455,4 @@
 #~ "נא לבחור לפחות נקודה, דרך או יחס אחד. רק לאלמנטים שכבר הועלו יש היסטוריה."
 
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "מספר שגוי של פרמטרים עבור פעולה על נקודה."
-
 #~ msgid "No \"via\" node or way found."
 #~ msgstr "לא נמצאה אף נקודה או דרך מסוג \"via\""
Index: /applications/editors/josm/i18n/po/is.po
===================================================================
--- /applications/editors/josm/i18n/po/is.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/is.po	(revision 23252)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
 "PO-Revision-Date: 2010-09-06 01:20+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:56+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -228,5 +228,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -248,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -268,7 +267,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -390,5 +390,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -415,4 +415,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -420,5 +421,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -453,5 +454,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Upplýsingar"
@@ -663,8 +664,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -676,5 +677,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Fjarlægja"
@@ -850,14 +851,14 @@
 msgstr "Hætta í forritinu."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr ""
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr ""
@@ -900,26 +901,22 @@
 msgstr "Sýna upplýsingar um þennan hlut á OpenStreetMap vefnum"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -930,5 +927,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -936,37 +933,67 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Bý til breytingarsett..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Hnútur endurtekinn í vegi"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -974,33 +1001,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Leysa árekstra"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Skipta veginum {0} í {1} hluta"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr ""
@@ -1501,12 +1517,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1527,6 +1542,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1561,6 +1576,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Villa"
@@ -1592,5 +1607,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1701,5 +1716,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Loka"
@@ -1725,5 +1740,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr ""
@@ -1755,5 +1770,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1941,10 +1956,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2339,4 +2354,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2481,17 +2497,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Færa þá"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Ekki færa þá"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2501,18 +2517,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2974,4 +2990,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3356,5 +3373,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr ""
@@ -3427,15 +3443,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3444,5 +3460,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3451,5 +3467,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3458,5 +3474,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3465,5 +3481,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3471,5 +3487,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3478,5 +3494,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3485,5 +3501,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3492,5 +3508,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3499,15 +3515,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
@@ -3522,23 +3527,4 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
 msgstr ""
 
@@ -3947,12 +3933,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, 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:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
 msgstr ""
 
@@ -4072,5 +4072,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "bygging"
@@ -4240,10 +4240,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Notandanafn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4414,8 +4414,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4633,5 +4633,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5162,9 +5162,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5177,9 +5177,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5265,5 +5264,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr ""
@@ -5551,5 +5550,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5647,11 +5646,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Bæta við"
@@ -5996,10 +5995,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr ""
@@ -7650,9 +7649,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Bæti vað eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7661,13 +7660,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7675,10 +7674,10 @@
 msgstr "<mismunandi>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Breyta eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7687,5 +7686,5 @@
 msgstr[1] "Breyta eigindum allt að {0} hluta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7694,77 +7693,86 @@
 msgstr[1] "Allt að {0} hlutum verður breytt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Veldu lykil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Veldu gildi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 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/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Eigindi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Eigindi valdra hluta."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Stak í"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "{0} eigindi & {1} vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Eigindi & vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Breyta venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Fjarlægja úr venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Eyða valinu úr venslunum {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Eyða völdum lykil í öllum völdum hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Eyða eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Bæta nýjum eigindum við valda hluti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Breyta gildi valins lykils í öllum völdum hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Eigindi valdra hluta."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr ""
@@ -8497,5 +8505,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9085,5 +9093,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11224,13 +11232,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Stillingarritill"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Hér er hægt að breyta öllum JOSM stillingum beint án annara milliliða."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11238,18 +11246,29 @@
 msgstr "Leita: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Veldu hlut til að eyða fyrst."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Bættu við nýjum eigindum"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11257,20 +11276,13 @@
 msgstr "Veldu hlut til að breyta fyrst."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Nýtt gildi fyrir {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Veldu hlut til að eyða fyrst."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Bættu við nýjum eigindum"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Gildi"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -11823,5 +11835,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr ""
@@ -12290,5 +12302,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12298,10 +12315,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12311,5 +12328,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12318,5 +12335,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12325,5 +12342,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12332,9 +12349,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Forstillingar"
@@ -14194,5 +14211,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr ""
@@ -14209,5 +14226,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr ""
@@ -14576,5 +14598,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -14670,4 +14692,27 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Breyta eigindum"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Flytja inn myndir"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Flytja inn myndir"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+msgid "Error while creating image layer: "
+msgstr ""
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15026,4 +15071,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15044,5 +15090,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15050,5 +15096,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -15533,8 +15579,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "vatn"
@@ -15595,6 +15641,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr ""
@@ -16057,6 +16103,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Tómt lag"
@@ -16274,6 +16320,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+msgid "External tool error"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16296,5 +16349,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -16999,5 +17052,5 @@
 msgstr ""
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr ""
@@ -17766,4 +17819,9 @@
 msgstr ""
 
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Nýtt gildi fyrir {0}"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
@@ -19696,5 +19754,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr ""
@@ -19830,140 +19888,143 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+msgid "Play/Pause"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Banki"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+msgid "Jump To"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Vað"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Líma"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Turn"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -19980,4 +20041,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20074,6 +20139,12 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "regluleg segð"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20101,5 +20172,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr ""
@@ -20110,6 +20181,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Íþróttamannvirki"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20140,5 +20212,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr ""
@@ -20270,24 +20342,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20298,80 +20370,80 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Niðurhala sýnilega reiti"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Breyta upplausn"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Hlaða reiti sem innihalda villur"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Vista WMS lag í skrá"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Hlaða WMS lag úr skrá"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Sjálfvirkt niðurhal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20380,5 +20452,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20388,73 +20460,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Stillingar fyrir WMS viðbótina"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
-msgid "Menu Name (Default)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
-msgid "WMS URL (Default)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
 msgid "Add WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr "Niðurhalsforrit:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of north:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
 msgid "Simultaneous connections"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
 msgid "Allow remote control (reqires remotecontrol plugin)"
 msgstr ""
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Þysja"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
+msgid "Menu Name (Default)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
+msgid "WMS URL (Default)"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Fjarlægja"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20517,5 +20600,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "skógur (ræktaður)"
@@ -20809,6 +20892,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -20818,15 +20907,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr ""
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -20838,10 +20927,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -20849,10 +20938,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -20861,15 +20950,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -20878,20 +20967,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -20901,15 +20990,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -20917,5 +21006,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -20925,15 +21014,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -20942,5 +21031,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -20950,20 +21039,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20971,5 +21060,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20977,5 +21066,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20984,5 +21073,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -20991,10 +21080,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21002,15 +21091,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21020,5 +21109,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21027,10 +21116,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21039,5 +21128,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21045,16 +21134,30 @@
 msgstr ""
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+msgid "Plugin for Seamap Editor"
+msgstr ""
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21064,15 +21167,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21081,5 +21184,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21088,5 +21191,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21095,10 +21198,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21107,5 +21210,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21115,5 +21218,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21122,20 +21225,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21144,5 +21247,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22036,4 +22139,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22041,5 +22188,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "hringtorg"
@@ -22546,5 +22693,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "íbúðargata"
@@ -22593,5 +22740,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "þjónustuvegur"
@@ -22624,6 +22771,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "byggingarsvæði"
@@ -23782,5 +23929,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr ""
@@ -23978,7 +24125,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "hjól"
@@ -24254,8 +24401,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr ""
@@ -25691,5 +25838,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr ""
@@ -26962,32 +27109,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "íþrótt"
@@ -28784,9 +28965,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr ""
@@ -30449,5 +30630,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr ""
@@ -30728,5 +30909,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -30744,5 +30925,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr ""
@@ -31119,7 +31300,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr ""
@@ -31211,9 +31392,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "vegþjónustur"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31223,5 +31412,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr ""
@@ -31240,7 +31429,19 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+msgid "highway_platform"
+msgstr ""
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "beygjuhringur"
@@ -31255,5 +31456,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr ""
@@ -31267,5 +31468,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "árbakki"
@@ -31279,5 +31480,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "lækur"
@@ -31291,5 +31492,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr ""
@@ -31493,14 +31694,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr ""
@@ -31514,5 +31715,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -31574,7 +31775,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr ""
@@ -31597,10 +31798,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr ""
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr ""
@@ -31634,7 +31835,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr ""
@@ -31679,6 +31880,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr ""
@@ -31700,5 +31901,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr ""
@@ -31712,5 +31913,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr ""
@@ -31788,8 +31989,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "skíðalyfta"
@@ -31805,5 +32006,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr ""
@@ -31817,5 +32018,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr ""
@@ -31829,5 +32030,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr ""
@@ -31841,5 +32042,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr ""
@@ -31853,5 +32054,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr ""
@@ -31865,5 +32066,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr ""
@@ -31983,11 +32184,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr ""
@@ -32000,5 +32201,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "bryggja"
@@ -32012,5 +32213,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "leiðsla"
@@ -32154,13 +32355,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "frístundir"
@@ -32174,5 +32375,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "smábátahöfn"
@@ -32268,10 +32469,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr ""
@@ -32381,11 +32582,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr ""
@@ -32823,24 +33024,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr ""
@@ -32872,6 +33073,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr ""
@@ -32932,8 +33133,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr ""
@@ -33294,26 +33495,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr ""
@@ -33385,8 +33586,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hótel"
@@ -33486,9 +33687,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "ferðamennska"
@@ -33576,9 +33777,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr ""
@@ -33591,5 +33792,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr ""
@@ -33603,5 +33804,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr ""
@@ -33623,5 +33824,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr ""
@@ -33635,5 +33836,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr ""
@@ -33656,5 +33857,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "smásala"
@@ -33668,5 +33869,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "iðnaður"
@@ -33680,5 +33881,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr ""
@@ -33692,5 +33893,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr ""
@@ -33704,5 +33905,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr ""
@@ -33759,7 +33960,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr ""
@@ -33773,5 +33974,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr ""
@@ -33784,5 +33985,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "tindur"
@@ -33797,5 +33998,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "jökul"
@@ -33809,5 +34010,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "eldfjall"
@@ -33861,8 +34062,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr ""
@@ -33876,5 +34077,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr ""
@@ -33888,5 +34089,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr ""
@@ -33900,5 +34101,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr ""
@@ -33912,5 +34113,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "leðja"
@@ -33924,5 +34125,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "strönd"
@@ -34000,8 +34201,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr ""
@@ -34090,12 +34291,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr ""
@@ -34245,11 +34446,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr ""
@@ -34263,5 +34464,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -34630,4 +34831,7 @@
 msgstr ""
 
+#~ msgid "Solve Conflicts"
+#~ msgstr "Leysa árekstra"
+
 #~ msgid "Incorrect password or username."
 #~ msgstr "Rangt lykilorð eða notandanafn"
Index: /applications/editors/josm/i18n/po/it.po
===================================================================
--- /applications/editors/josm/i18n/po/it.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/it.po	(revision 23252)
@@ -5,7 +5,7 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
-"PO-Revision-Date: 2010-09-10 13:41+0000\n"
-"Last-Translator: Andrea Amoroso <andrea.amoroso@alice.it>\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
+"PO-Revision-Date: 2010-09-14 08:58+0000\n"
+"Last-Translator: Lucio <Unknown>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,5 +13,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -79,6 +79,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -234,5 +234,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -254,5 +253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -274,7 +273,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -396,5 +396,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -421,4 +421,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -426,5 +427,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -459,5 +460,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Informazioni"
@@ -672,8 +673,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -685,5 +686,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Cancella"
@@ -864,14 +865,14 @@
 msgstr "Esci dall''applicazione."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Visualizza a schermo pieno"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Commuta la visualizzazione a schermo pieno"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Commuta la visualizzazione a schermo pieno"
@@ -916,26 +917,22 @@
 "Visualizza le informazioni dell''oggetto OSM su nodi, percorsi o relazioni."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Unisci aree sovrapposte"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Unisci aree che si sovrappongono l''un l''altra"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "Selezionare almeno un percorso chiuso che dovrebbe essere unito."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Attualmente solo due aree possono essere unite."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" non è chiuso e quindi non può essere unito."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -948,5 +945,5 @@
 "I percorsi selezionati hanno dei nodi esterni alla zona dei dati scaricati"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -954,13 +951,14 @@
 msgstr "Ciò potrebbe portare alla cancellazione accidentale di nodi"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Sei realmente sicuro di proseguire?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Si prega di annullare se non si è sicuri"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr ""
@@ -968,25 +966,54 @@
 "modifica."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Ripristina gruppo di modifiche"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Rimozione dei nodi duplicati in corso..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Nodo aggiunto su tutte le intersezioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Elimina i percorsi che non fanno parte di un multi-poligono interno"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Correggi le relazioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "L''area auto-sovrapposta è stata unita"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Le aree sovrapposte sono state unite"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -996,33 +1023,22 @@
 "favore verifica che non siano stati introdotti errori."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Inserire dei valori per tutti i conflitti."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Risolvi conflitti"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Correggi i conflitti di etichette"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Dividi il segmento del percorso"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Sono stati rimossi elementi dalle Relazioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Unisi Aree: Elimina le way corte"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Strada chiusa (anello)"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Rimuovi i tag dalle way interne"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Funzione di unione delle Aree"
@@ -1560,12 +1576,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1586,6 +1601,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1620,6 +1635,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Errore"
@@ -1651,5 +1666,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1764,5 +1779,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Chiudi"
@@ -1788,5 +1803,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "No, annulla"
@@ -1818,5 +1833,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -2019,10 +2034,10 @@
 msgstr "Nodo staccato"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Duplica in {0} nodi"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2442,4 +2457,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2597,17 +2613,17 @@
 msgstr[1] "Aggiungi e sposta un nuovo nodo virtuale sui {0} percorsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Muovi elementi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Muoverli"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Annullare lo spostamento"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2620,5 +2636,5 @@
 "Si vuole veramente spostarli?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2626,5 +2642,5 @@
 "rettangolo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2633,9 +2649,9 @@
 "più vicino."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Rilascia il bottone del mouse per interrompere la rotazione."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3147,4 +3163,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3544,5 +3561,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Nuovo valore"
@@ -3619,15 +3635,15 @@
 msgstr "Valore ''''{0}'''' non valido per la longitudine"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, 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:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, 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:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3638,5 +3654,5 @@
 "delle preferenze ''{0}'' non è in realtà una cartella."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3647,5 +3663,5 @@
 "preferenze ''{0}'' non è in realtà una cartella.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3656,5 +3672,5 @@
 "possibile creare la cartella delle preferenze mancante: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3665,5 +3681,5 @@
 "creare la cartella delle preferenze mancante: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3673,5 +3689,5 @@
 "file di preferenze predefinito."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3682,5 +3698,5 @@
 "file predefinito."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3691,5 +3707,5 @@
 "reimpostare il file delle preferenze con uno predefinito: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3701,5 +3717,5 @@
 "predefinito.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3709,18 +3725,4 @@
 "Attenzione: fallita l''inizializzazione delle preferenze.Non è stato "
 "possibile reimpostare il file delle preferenze con uno predefinito: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-"Errore: linea ''''{0}'''' non prevista nel file di segnalibro ''''{1}''''"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Errore: valore in doppia precisione ''''{0}'''' non valido alla linea "
-"''''{1}'''' nel file di segnalibro ''''{2}''''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3737,29 +3739,4 @@
 msgid "Could not load preferences from server."
 msgstr "Impossibile scaricare le preferenze dal server."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-"Errore: linea ''''{0}'''' non prevista nella lista dei segnalibri "
-"proveniente dal server"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-"Errore: valore in doppia precisione ''''{0}'''' non valido alla linea "
-"''''{1}'''' nella lista dei segnalibri proveniente dal server"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"Fallito il caricamento dei segnalibri da ''{0}'' per ragioni di sicurezza. "
-"L''errore è stato: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4189,5 +4166,29 @@
 msgstr "UTM Sistema Geodesic"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "Numero errato di parametri per operatore sui nodi."
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Errore nella creazione della cartella di cache: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+"Errore: linea ''''{0}'''' non prevista nel file di segnalibro ''''{1}''''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Errore: valore in doppia precisione ''''{0}'''' non valido alla linea "
+"''''{1}'''' nel file di segnalibro ''''{2}''''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
@@ -4195,9 +4196,4 @@
 "<html>Impossibile leggere i segnalibri da<br>''{0}''<br>Errore generato: {1}"
 "</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>Impossibile scrivere il segnalibro.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4316,5 +4312,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "building"
@@ -4493,10 +4489,10 @@
 msgstr "Se specificato, reimposta la configurazione invece di leggerla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Nome utente"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4686,8 +4682,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4915,5 +4911,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5497,9 +5493,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5512,9 +5508,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5604,5 +5599,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "nessuno"
@@ -5926,5 +5921,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -6032,11 +6027,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Aggiungi"
@@ -6388,10 +6383,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "Seleziona nella lista delle relazioni"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "Selezionare la relazione nella lista delle relazioni"
@@ -8124,9 +8119,9 @@
 "L'indirizzo URL per l'interrogazione sui gruppi di modifiche non è valido"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Aggiungi proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -8135,13 +8130,13 @@
 msgstr[1] "Questo modificherà fino a {0} oggetti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "Un campo vuoto cancellerà il tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -8149,10 +8144,10 @@
 msgstr "<diverso>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Cambiare i valori?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -8161,5 +8156,5 @@
 msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -8168,77 +8163,86 @@
 msgstr[1] "Questo cambierà {0} oggetti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Seleziona una chiave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Seleziona un valore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 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/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Proprietà/Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Proprietà per gli oggetti selezionati."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Membro di"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr "Posizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Proprietà: {0} / Appartenenze: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Proprietà / Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Cambia relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Elimina dalla relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Vuoi veramente cancellare la selezione dalla relazione {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Cancella la chiave selezionata in tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Elimina proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Proprietà per gli oggetti selezionati."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "Selezionare la relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "Selezionare la relazione nella selezione principale"
@@ -9038,5 +9042,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9711,5 +9715,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -12121,13 +12125,13 @@
 msgstr "Ottenimento delle informazioni utente..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Preferenze avanzate"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Impostazione diretta delle preferenze. Usare con cautela!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -12135,14 +12139,14 @@
 msgstr "Cerca: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Il valore corrente è quello di default."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Il valore di default è ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
@@ -12150,5 +12154,16 @@
 "usata)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Scegli la riga da cancellare."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Inserisci una nuova coppia chiave/valore"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -12156,20 +12171,13 @@
 msgstr "Scegli la riga da modificare."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Nuovo valore per {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Scegli la riga da cancellare."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Inserisci una nuova coppia chiave/valore"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Valore"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12773,5 +12781,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Abilita lo stile predefinito ''incorporato''"
@@ -13287,5 +13295,10 @@
 "''''{0}''''. Ottenuto ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Impossibile leggere la lista delle etichette preimpostate: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -13297,5 +13310,5 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
@@ -13303,5 +13316,5 @@
 "Non è stato possibile leggere il sorgente delle etichette preimpostate {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -13314,5 +13327,5 @@
 "width=600>L''errore è: [{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -13324,5 +13337,5 @@
 "width=400>L''errore è: [{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -13334,5 +13347,5 @@
 "width=600>L''errore è: {1}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -13344,9 +13357,9 @@
 "width=600>L''errore è: {1}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Ordina il menu dei preimpostati"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Etichette preimpostate"
@@ -13820,5 +13833,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:954
 msgid "Add relation"
-msgstr ""
+msgstr "Aggiungi relazione"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:975
@@ -13845,5 +13858,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 msgid "New relation"
-msgstr ""
+msgstr "Nuova relazione"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1078
@@ -15441,5 +15454,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "nessuna descrizione disponibile"
@@ -15458,5 +15471,10 @@
 msgstr "Il file ''{0}'' dell''estensione non include un Manifest."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "Ulteriori informazioni..."
@@ -15927,5 +15945,5 @@
 "dal codice JOSM ''{0}''. Utilizzo del codice predefinito ''en''."
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -16038,4 +16056,28 @@
 "ripristinare la geometria della finestra dalle preferenze."
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Modifica Proprietà"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Importa immagini"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Trascina immagine non georeferenziata"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Errore durante la creazione del backup del livello rimosso: {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -16414,4 +16456,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr "Allinea percorsi"
@@ -16434,5 +16477,5 @@
 msgstr "L''allineamento posizionerebbe i nodi al di fuori del pianeta.\n"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr "Sono pronto!"
@@ -16440,5 +16483,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr "Suggerimenti AlignWays"
@@ -17022,8 +17065,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "acqua"
@@ -17084,6 +17127,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "indirizzo"
@@ -17592,6 +17635,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Livello vuoto"
@@ -17816,6 +17859,15 @@
 msgstr "Non è stato trovato alcun livello dei dati GPX."
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Strumenti esterni"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+#, fuzzy
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr "Lo script figlio riporta dati non validi"
 
@@ -17838,5 +17890,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr "Usa script esterni in JOSM"
@@ -18091,13 +18143,18 @@
 "with [irs rectify] in subject."
 msgstr ""
+"Questa opzione crea il livello di correzione IRS ed alcune altre cose al suo "
+"interno. Prima bisogna correggere la posizione del livello WMs.\n"
+"Il livello risultante deve essere salvato come .osm ed inviato a Komzpa "
+"(me@komzpa.net) con [irs rectify] come oggetto."
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:70
 msgid "Zoom level was not enough to record an offset precisely"
 msgstr ""
+"Il livello di zoom non era sufficiente per registrare un offset preciso"
 
 #. if there are none, create one
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:103
 msgid "IRS Adjustment Layer"
-msgstr ""
+msgstr "Livello di Correzione IRS"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
@@ -18567,5 +18624,5 @@
 msgstr "Selezionare almeno due percorsi."
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -19367,4 +19424,9 @@
 msgid "Enter weight values"
 msgstr "Inserire i valori di peso"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Nuovo valore per {0}"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
@@ -21453,5 +21515,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "area"
@@ -21594,140 +21656,146 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "{0} {1}% della traccia GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr "Visualizza la posizione corrente nel video"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr "Importa video"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr "Sincronizza un video su questa traccia GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr "Rimuovi video"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr "Rimuovi il video corrente dal livello"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr "play/pausa"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Esegui/Pausa"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr "Inizia/ferma la riproduzione video"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
 msgstr "Indietro"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr "salta n secondi indietro"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr "vai a"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Salta Avanti"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr "si posiziona in corrispondenza dell''ora gps inserita"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr "si prega di inserire l''ora GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr "avanti"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Avanti"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr "salta n secondi avanti"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr "più veloce"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Più veloce"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr "aumenta velocità riproduzione"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr "più lento"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Più lento"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr "diminuisce velocità riproduzione"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+#, fuzzy
+msgid "Loop"
 msgstr "ripeti"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr "ripete per n secondi in prossimità della posizione corrente"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr "Mantieni centrato"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr "segui l'icona del video automaticamente"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr "Visualizza i sottotitoli nel video"
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr "Lunghezza salto"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 msgid "Set the length of a jump"
 msgstr "Imposta la lunghezza del salto"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr "Salta il video per x ms"
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr "Lunghezza ripetizione"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr "Imposta la lunghezza in corrispondenza di un punto di ripetizione"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr "non deinterlacciare"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr "Deinterlacciamento con raddoppio linea"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr "deinterlacciamento con interpolazione lineare"
@@ -21745,4 +21813,8 @@
 msgid "play"
 msgstr "riproduci"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
+msgstr "ripeti"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
@@ -21856,6 +21928,12 @@
 msgstr "Il nodo ''''{0}'''' è un incrocio con più di 2 percorsi connessi."
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Inserire una espressione di ricerca"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr "Seleziona un punto del percorso per muovere la mappa"
@@ -21885,5 +21963,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Nome del menu"
@@ -21894,6 +21972,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr "Ottieni i livelli"
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Strutture sportive"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21927,5 +22006,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "URL WMS"
@@ -22065,5 +22144,5 @@
 "Potrebbero essere presenti errori nelle coordinate."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -22072,9 +22151,9 @@
 "non corretto ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr "(disattivato)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
@@ -22082,10 +22161,10 @@
 "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Livello WMS ({0}), scaricamento per il livello di ingrandimento {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -22101,17 +22180,17 @@
 "WMS?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "Si, preleva le immagini"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "Indirizzo URL non valido?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Scarica i tasselli visibili"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -22120,63 +22199,63 @@
 "visuale, oppure di cambiare la risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Cambia risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Ricarica i tasselli non corretti"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Salva il livello WMS su file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Salva livello WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Carica il livello WMS da file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "Carica livello WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Versione del file WMS non supportata; trovata {0}, attesa {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Errore nel formato del file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Errore durante il caricamento del file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "Imposta segnalibro WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Scaricamento automatico"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr "Impossibile inizializzare il controllo remoto."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr "L''estensione di controllo remoto non è compatibile con {0}."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -22187,5 +22266,5 @@
 "Si dovrebbero aggiornare le estensioni."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -22199,70 +22278,76 @@
 "segnalarlo per \"{0}\"."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr "{0}: Problema con il controllo remoto"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Apri un livello WMS vuoto per caricare i dati da file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Preferenze dell''estensione WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 "Modifica la lista dei server WMS mostrata nel menù dell''estensione WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr "Aggiungi indirizzo URL WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "Copia il predefinito selezionato"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "Selezionare almeno una riga da copiare."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "Downloader:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "Sovrapponi i tasselli"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "% est:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "% nord:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr "Connessioni simultanee"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr "Abilita controllo remoto (richiede l''estensione remotecontrol)"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Ingrandimento"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Nome del menu (predefinito)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "URL WMS (Predefinito)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr "Aggiungi indirizzo URL WMS"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "Copia il predefinito selezionato"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "Selezionare almeno una riga da copiare."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "Downloader:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "Sovrapponi i tasselli"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "% est:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "% nord:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr "Connessioni simultanee"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr "Abilita controllo remoto (richiede l''estensione remotecontrol)"
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
@@ -22271,4 +22356,9 @@
 "Remote Control ha richiesto il caricamento di un livello WMS dal seguente "
 "indirizzo URL:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Elimina"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -22338,5 +22428,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "foresta"
@@ -22630,6 +22720,12 @@
 msgstr "Saturazione:"
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -22642,10 +22738,10 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr "Strumenti per il disegno degli edifici."
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
@@ -22653,5 +22749,5 @@
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -22669,10 +22765,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "Crea un reticolo di ways"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -22682,5 +22778,5 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
@@ -22688,5 +22784,5 @@
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -22697,15 +22793,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr "Scarica i dati OSM lungo un percorso"
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "Duplica i percorsi con una differenza"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -22716,5 +22812,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
@@ -22723,5 +22819,5 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
@@ -22729,10 +22825,10 @@
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "Fornisce un livello di sfondo che visualizza una griglia di mappa"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -22746,15 +22842,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
-msgstr ""
+msgstr "Un assistente per la correzione satellitare IRS."
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "Aiuta nella vettorizzazione delle immagini WMS."
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -22764,5 +22860,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -22776,15 +22872,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "Aggiunge divieti di svolta a sinistra per insiemi di 4 o 5 percorsi"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr "Converti semplicemente un''area in un multi-poligono."
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -22795,5 +22891,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -22807,20 +22903,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr "opzioni avanzate per la modifica degli orari di apertura"
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "Visualizza una immagine di sfondo OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importa le segnalazioni da OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -22830,5 +22926,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -22838,5 +22934,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -22847,5 +22943,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -22856,10 +22952,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Il grande aspetto e stile JGoodies Plastic."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -22869,15 +22965,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Permetti alle altre applicazioni di inviare comandi a JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr "Estensione per il ripristino dei gruppi di modifiche"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -22891,5 +22987,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -22901,10 +22997,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Fornisce funzioni di navigazione"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -22916,5 +23012,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -22924,16 +23020,32 @@
 "tasselli dalla slippy map e richiedere aggiornamenti."
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+#, fuzzy
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr "Crea e modifica le caratteristiche nautiche per OpenSeaMap"
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "Informazioni sull''estensione"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permetti l''aggiunta di marcatori/nodi alle posizioni gps correnti."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Fornisce un''interfaccia per l''editing dei tag in forma tabulare"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22947,15 +23059,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "Costruisce un complesso di edifici a partire da singoli blocchi."
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr "Crea e modifica le caratteristiche nautiche per OpenSeaMap"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22967,5 +23079,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22976,5 +23088,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22985,10 +23097,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr "Permette di ripristinare un oggetto dal database di OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -23000,5 +23112,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -23011,5 +23123,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -23021,5 +23133,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -23027,15 +23139,15 @@
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr "Abilita la ricerca di un punto del percorso importato da un file gpx."
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Seleziona una sequenza di percorsi connessi non ramificati"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -23046,5 +23158,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -23733,5 +23845,5 @@
 #: build/trans_presets.java:1273 build/trans_presets.java:2805
 msgid "wood"
-msgstr "bosco"
+msgstr "legno"
 
 #: build/trans_presets.java:265 build/trans_presets.java:283
@@ -23940,4 +24052,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -23945,5 +24101,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "rotatoria"
@@ -24450,5 +24606,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "residenziale"
@@ -24497,5 +24653,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "strada di servizio"
@@ -24528,6 +24684,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "construction"
@@ -25686,5 +25842,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "palude alluvionale"
@@ -25882,7 +26038,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "bicicletta"
@@ -26158,8 +26314,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "ferrovia"
@@ -27467,5 +27623,5 @@
 msgctxt "airport"
 msgid "Gate"
-msgstr ""
+msgstr "Uscita"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
@@ -27595,5 +27751,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "terminal aeroportuale"
@@ -28866,32 +29022,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "sport"
@@ -30688,9 +30878,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "verde"
@@ -32354,5 +32544,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "metropolitana"
@@ -32633,5 +32823,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32649,5 +32839,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "deprecato"
@@ -33024,7 +33214,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "tracciato stradale"
@@ -33116,9 +33306,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "stazione di servizio"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33128,5 +33326,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "guado"
@@ -33145,7 +33343,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "tracciato stradale"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "slargo per inversione di marcia"
@@ -33160,5 +33371,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr "punto di accesso di emergenza"
@@ -33172,5 +33383,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "sponda"
@@ -33184,5 +33395,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "torrente"
@@ -33196,5 +33407,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "darsena"
@@ -33398,14 +33609,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "costruzioni umane"
@@ -33419,5 +33630,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr "rapide"
@@ -33479,7 +33690,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "punto ferroviario"
@@ -33502,10 +33713,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "altro ferrovia"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "ferrovia (sopra)"
@@ -33539,7 +33750,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "vecchia ferrovia"
@@ -33584,6 +33795,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "aeroporto"
@@ -33605,5 +33816,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "aeroporto (scuro)"
@@ -33617,5 +33828,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "aeroporto (chiaro)"
@@ -33693,8 +33904,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "struttura_di_risalita"
@@ -33710,5 +33921,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "pista_facile"
@@ -33722,5 +33933,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "pista_intermedia"
@@ -33734,5 +33945,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "pista_avanzata"
@@ -33746,5 +33957,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr "pista esperto"
@@ -33758,5 +33969,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "pista libera"
@@ -33770,5 +33981,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "pista_principiante"
@@ -33888,11 +34099,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "elettricità"
@@ -33905,5 +34116,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "pontile"
@@ -33917,5 +34128,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "conduttura"
@@ -34059,13 +34270,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "struttura per lo svago"
@@ -34079,5 +34290,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "porto turistico"
@@ -34173,10 +34384,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "struttura di servizio"
@@ -34286,11 +34497,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "servizio al traffico"
@@ -34728,24 +34939,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "struttura di servizio (chiaro)"
@@ -34777,6 +34988,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "acqua (chiaro)"
@@ -34837,8 +35048,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "salute"
@@ -35199,26 +35410,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "negozio"
@@ -35290,8 +35501,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hotel"
@@ -35391,9 +35602,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "turismo"
@@ -35481,9 +35692,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "attrazione storica"
@@ -35496,5 +35707,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "cava/miniera"
@@ -35508,5 +35719,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "discarica"
@@ -35528,5 +35739,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "bacino"
@@ -35540,5 +35751,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "aia"
@@ -35561,5 +35772,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "area commerciale (negozi)"
@@ -35573,5 +35784,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "industriale"
@@ -35585,5 +35796,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "ridestinazione d''uso"
@@ -35597,5 +35808,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "area agricola destinata alla costruzione"
@@ -35609,5 +35820,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "area ferroviaria"
@@ -35664,7 +35875,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "militare"
@@ -35678,5 +35889,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "cimitero"
@@ -35689,5 +35900,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "picco montuoso"
@@ -35702,5 +35913,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "ghiacciaio"
@@ -35714,5 +35925,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "vulcano"
@@ -35766,8 +35977,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "elemento naturale"
@@ -35781,5 +35992,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "boscaglia"
@@ -35793,5 +36004,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "brughiera"
@@ -35805,5 +36016,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "area boschiva non gestita"
@@ -35817,5 +36028,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "zona fangosa (sabbie mobili)"
@@ -35829,5 +36040,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "spiaggia"
@@ -35905,8 +36116,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "itinerario"
@@ -35995,12 +36206,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "confine"
@@ -36150,11 +36361,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "luogo"
@@ -36168,5 +36379,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr "dati tiger"
@@ -36535,4 +36746,62 @@
 msgstr "PCN 2006 - Italia"
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Attualmente solo due aree possono essere unite."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "L''area auto-sovrapposta è stata unita"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Inserire dei valori per tutti i conflitti."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Risolvi conflitti"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Unisi Aree: Elimina le way corte"
+
+#~ msgid "Closed Way"
+#~ msgstr "Strada chiusa (anello)"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr ""
+#~ "Errore: linea ''''{0}'''' non prevista nella lista dei segnalibri "
+#~ "proveniente dal server"
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr ""
+#~ "Errore: valore in doppia precisione ''''{0}'''' non valido alla linea "
+#~ "''''{1}'''' nella lista dei segnalibri proveniente dal server"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Fallito il caricamento dei segnalibri da ''{0}'' per ragioni di "
+#~ "sicurezza. L''errore è stato: {1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>Impossibile scrivere il segnalibro.<br>{0}</html>"
+
+#~ msgid "play/pause"
+#~ msgstr "play/pausa"
+
+#~ msgid "jump"
+#~ msgstr "vai a"
+
+#~ msgid "forward"
+#~ msgstr "avanti"
+
+#~ msgid "faster"
+#~ msgstr "più veloce"
+
+#~ msgid "slower"
+#~ msgstr "più lento"
+
+#~ msgid "Get Layers"
+#~ msgstr "Ottieni i livelli"
+
 #~ msgid "No data imported."
 #~ msgstr "Nessun dato importato."
@@ -36810,7 +37079,4 @@
 #~ msgid "Conflicting relation"
 #~ msgstr "Conflitto tra relazioni"
-
-#~ msgid "Split way segment"
-#~ msgstr "Dividi il segmento del percorso"
 
 #~ msgid "Merging conflicts."
@@ -37694,7 +37960,4 @@
 #~ msgstr "Risolvi conflitti nella lista dei membri della relazione {0}"
 
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Numero errato di parametri per operatore sui nodi."
-
 #~ msgid ">"
 #~ msgstr ">"
Index: /applications/editors/josm/i18n/po/ja.po
===================================================================
--- /applications/editors/josm/i18n/po/ja.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/ja.po	(revision 23252)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
-"PO-Revision-Date: 2010-09-06 00:23+0000\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
+"PO-Revision-Date: 2010-09-12 12:47+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Japanese <tr@openstreetmap.jp>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:55+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: JAPAN\n"
@@ -85,6 +85,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -238,5 +238,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -258,5 +257,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -278,7 +277,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -403,5 +403,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -428,4 +428,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -433,5 +434,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -466,5 +467,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "情報"
@@ -675,8 +676,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -688,5 +689,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "削除"
@@ -863,14 +864,14 @@
 msgstr "アプリケーションを終了します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "全画面ビュー"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "全画面ビューを切り替え"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "全画面ビューを切り替え"
@@ -913,26 +914,22 @@
 msgstr "OSM ノード、ウェイまたはリレーションについてのオブジェクト情報を表示"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "オーバーラップ領域を接続する。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "お互いのオーバラップ範囲を接続する。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "結合するクローズドウェイを少なくともひとつ選んでください"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "現在最大2つまでのエリアのみ結合できます。"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" は閉じられていないので連結できません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -943,5 +940,5 @@
 "選択したウェイにはダウンロードされたデータ領域の外にノードがあります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -949,37 +946,67 @@
 msgstr "これにより思わぬノードが削除されることがあります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "本当に継続しますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "確信していないならば、中止して下さい。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "交差点がみつかりません。何も変更されませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "変更セットを元に戻す"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "重複したノードの削除中…"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "すべての交差点にノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "内側のマルチポリゴンの一部ではないウェイを削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "リレーションの修正"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "結合された自己重複エリア"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "結合されたオーバーラップエリア"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -989,33 +1016,22 @@
 "確認してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "すべての競合に値を入力してください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "競合を解決する"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "タグの競合を修正"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "ウェイのセグメントを分割"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "リレーションから要素を削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "エリアの結合：　短いウェイの削除"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "閉じたウェイ"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "内部のウェイからタグを削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "エリア結合機能"
@@ -1535,12 +1551,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1561,6 +1576,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1595,6 +1610,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "エラー"
@@ -1626,5 +1641,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1737,5 +1752,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "閉じる"
@@ -1761,5 +1776,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "いいえ、異常終了します"
@@ -1791,5 +1806,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1981,10 +1996,10 @@
 msgstr "ノードを引き離す"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "{0}ノードと見なす"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2382,4 +2397,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2528,17 +2544,17 @@
 msgstr[0] "仮の新規ノードを ウェイに追加し、動かしてください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "要素を移動"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "これらを移動する。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "移動を取り消す"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2551,9 +2567,9 @@
 "本当に移動しますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2562,9 +2578,9 @@
 "マージします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "回転を止めるには、マウスボタンを放します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3057,4 +3073,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3441,5 +3458,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "新しい値"
@@ -3512,15 +3528,15 @@
 msgstr "不正な経度の値 ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "警告: プリセットの設定を ''{0}''とするのに失敗しました。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "不正な設定がファイルの{0}行目にあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3531,5 +3547,5 @@
 "ありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3540,5 +3556,5 @@
 "ではありません。</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3548,5 +3564,5 @@
 "警告: 設定の初期化に失敗しました。設定ディレクトリ {0} の作成に失敗しました。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3557,5 +3573,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3565,5 +3581,5 @@
 "成します。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3573,5 +3589,5 @@
 "警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3582,5 +3598,5 @@
 "トできません</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3591,5 +3607,5 @@
 "<br>に取って、新しい初期設定ファイルを作ります。</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3599,16 +3615,4 @@
 "警告: 設定の初期化に失敗しました。設定ファイルのデフォルト: {0} へのリセット"
 "に失敗"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "エラー: ブックマークファイル''{1}'' に予期せぬ行 ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"エラー: ブックマークファイル ''{2}'' 内の行 ''{1}'' に不正なダブル値 ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3625,26 +3629,4 @@
 msgid "Could not load preferences from server."
 msgstr "サーバから設定をロードできませんでした。"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr "エラー: サーバからのブックマークリストに予期せぬ行 ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-"エラー: サーバからのブックマークリストの行 ''{1}'' に不正なダブル値 ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"''{0}'' からのブックマークのロードはセキュリティ上の理由で失敗しました。例外"
-"の内容: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4061,14 +4043,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "間違った数のパラメータが、ノード演算子に渡されました。"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "キャッシュディレクトリ {0} の作成中にエラーが発生しました."
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "エラー: ブックマークファイル''{1}'' に予期せぬ行 ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"エラー: ブックマークファイル ''{2}'' 内の行 ''{1}'' に不正なダブル値 ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 "<html>''{0}''<br>からブックマークが読み込めません<br>エラー内容: {1}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>ブックマークを書き込めません。<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4186,5 +4185,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "建物"
@@ -4360,10 +4359,10 @@
 msgstr "もし指定されると、読み込む代わりに設定をリセットします。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "ユーザ名"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4538,8 +4537,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4764,5 +4763,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5313,9 +5312,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5328,9 +5327,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5416,5 +5414,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "なし"
@@ -5711,5 +5709,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5808,11 +5806,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "追加"
@@ -6157,10 +6155,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "関連リストから選択"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "リレーション一覧のリレーションを選択。"
@@ -7841,9 +7839,9 @@
 msgstr "不正な変更セットクエリURLです"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "プロパティの追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7851,13 +7849,13 @@
 msgstr[0] "これにより {0} オブジェクトが変更されます"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "空の値でタグを削除します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7865,10 +7863,10 @@
 msgstr "<差異あり>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "値を変更しますか?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7876,5 +7874,5 @@
 msgstr[0] "{0}このオブジェクトのプロパティーの変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7882,77 +7880,86 @@
 msgstr[0] "これにより、{0} 個のオブジェクトが変更されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "キーを選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "値を選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 msgid "Please select the objects you want to change properties for."
 msgstr "プロパティを変えたいオブジェクトを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "選択したオブジェクトのプロパティ"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr "位置"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "プロパティ: {0} / メンバー: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "関連の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "本当に関連{0}から選択分を削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "すべてのオブジェクトの選択したキーの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "プロパティの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "すべてのオブジェクトに新しいキー/値をペアで追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "すべてのオブジェクトの選択したキーの値の編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "選択したオブジェクトのプロパティ"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "リレーションを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "メインの選択肢から条件を選んでください"
@@ -8709,5 +8716,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9350,5 +9357,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11614,13 +11621,13 @@
 msgstr "ユーザ情報を参照中..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "高度な設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "設定項目を直接変更。利用に注意！"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11628,18 +11635,29 @@
 msgstr "検索: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "現在の値は既定値です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "既定値は \"{0}\"です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr "不明なときの既定値(設定はまだ使われません）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "削除する列を選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "新しいキー/値の組を入力"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11647,20 +11665,13 @@
 msgstr "編集する列を選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "新しい値は{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "削除する列を選択してください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "新しいキー/値の組を入力"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "値"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12224,5 +12235,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "ビルトインのデフォルトを有効"
@@ -12696,5 +12707,10 @@
 msgstr "警告: スタイルリスト ''{0}'' 中に不正な形式のエントリ。入力値 ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "タグ付けプリセットのソース {0} を読み込めません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12706,10 +12722,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr "タグ付けプリセットソース {0} を読み込めません"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12719,5 +12735,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12728,5 +12744,5 @@
 "か？<br><br><table width=400>エラーコード: [{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12738,5 +12754,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12747,9 +12763,9 @@
 "か？<br><br><table width=600>エラーコード: {1}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "プリセットメニューの並び替え"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "タグ付けプリセット"
@@ -14710,5 +14726,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "説明がありません"
@@ -14727,5 +14743,10 @@
 msgstr "プラグインファイル ''{0}'' はマニフェストを含みません。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "詳細情報..."
@@ -15157,5 +15178,5 @@
 "\"en\"を使用します。"
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -15263,4 +15284,28 @@
 "ん。"
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "プロパティを変更する"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "イメージのインポート"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "非地理参照画像を取得"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "次の削除済みレイヤのバックアップ作成中にエラー: {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15623,4 +15668,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr "ウェイをアライン"
@@ -15641,5 +15687,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr "準備完了！"
@@ -15647,5 +15693,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -16145,8 +16191,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "水域(湖沼)"
@@ -16207,6 +16253,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "住所"
@@ -16700,6 +16746,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "空のレイヤー"
@@ -16922,6 +16968,15 @@
 msgstr "GPXデータのレイヤーがありません"
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "外部ツール"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+#, fuzzy
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr "子スクリプトが不正なデータを返した"
 
@@ -16944,5 +16999,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr "JOSM中での外部スクリプトの使用"
@@ -17657,5 +17712,5 @@
 msgstr "少なくとも2つのウェイを選択してください。"
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -18446,4 +18501,9 @@
 msgstr "重みの値の入力"
 
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "新しい値は{0}"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
@@ -20405,5 +20465,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "領域"
@@ -20543,140 +20603,145 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr "ビデオ中の現在位置を表示"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr "ビデオをインポート"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr "このGPSトラックに対してビデオを同期"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr "ビデオを削除"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr "現在のビデオをレイヤから削除"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr "再生/停止"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "再生/一時停止"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr "ビデオ再生を開始/停止"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
 msgstr "戻る"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr "n 秒前にジャンプ"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr "ジャンプ"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "次にジャンプ"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr "入力されたGPS時刻にジャンプ"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr "GPSのタイムコードを入力してください"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
 msgstr "進む"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr "n 秒先にジャンプ"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "もっと速く"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "遅く"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20693,4 +20758,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20797,6 +20866,12 @@
 msgstr "ノード ''{0}'' は2以上のウェイが接続されたジャンクションです。"
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "検索表現を入力してください"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20824,5 +20899,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "メニューの名前"
@@ -20833,6 +20908,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "スポーツ施設"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20863,5 +20939,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "WMS URL"
@@ -20999,24 +21075,24 @@
 "間違った座標にたどりつく可能性があります。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr "警告: WMS レイヤーは不正なベースURL ''{0}'' のために無効化されました"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr "(無効化)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS レイヤー ({0}), 自動的に倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS レイヤー ({0}), 自倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -21030,17 +21106,17 @@
 "設定を<br>チェックしてください。<br>強制的にWMS タイルを取得しますか？"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "はい、画像を取得します"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "不正なURL？"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "見えるタイルのダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21048,63 +21124,63 @@
 "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "解像度の変更"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "誤ったタイルのリロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "アルファチャンネル"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "WMSレイヤーをファイルに保存"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "WMS レイヤーを保存"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "WMSレイヤーをファイルから読み込む"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "WMS レイヤーをロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "ファイルフォーマットエラー"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "ファイルの読み込みエラー"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "WMSブックマークをセット"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "自動ダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -21113,5 +21189,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -21121,73 +21197,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "ファイルからデータをロードするためのブランクWMSレイヤーを開く"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "WMSプラグイン設定"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "WMSプラグインメニューに表示されるWMS サーバのリストを変更"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "選択されたデフォルトをコピー"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "コピーする列を少なくともひとつ選んでください。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "ダウンローダ:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "タイルをオーバーラップ"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "東の %"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "北の %"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "ズーム"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "メニュー名(既定)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "WMS URL (既定)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "選択されたデフォルトをコピー"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "コピーする列を少なくともひとつ選んでください。"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "ダウンローダ:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "タイルをオーバーラップ"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "東の %"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "北の %"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "削除"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21255,5 +21342,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "森"
@@ -21547,6 +21634,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -21556,15 +21649,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr "建物描画用ツール"
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr "フランス土地台帳WMS server 用の特別なハンドラ。"
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -21580,10 +21673,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "ウェイのグリッドを作成。"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -21592,5 +21685,5 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
@@ -21598,5 +21691,5 @@
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21607,15 +21700,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "オフセットのあるウェイを複製"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21626,20 +21719,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "GlobalSat DG-100データロガーからJOSMに直接GPSポイントをダウンロード"
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr "ルーティング情報をルーティンググラフとして可視化する。"
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "地図グリッドを表示する背景レイヤーを提供します。"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21652,15 +21745,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "WMS イメージのベクトル化を支援する"
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21668,5 +21761,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21678,15 +21771,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "4 または5のウェイのセットに左折禁止を追加"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr "単純にエリアをマルチポリゴンに変換します。"
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21697,5 +21790,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21708,15 +21801,15 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "OpenLayers の背景画面を表示"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
@@ -21725,5 +21818,5 @@
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21731,5 +21824,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21739,5 +21832,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21748,5 +21841,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21757,10 +21850,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "偉大なJGoodies のプラスティック風のルック＆フィール。"
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21768,15 +21861,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "他のアプリーケーションにJOSM へのコマンドを送信させる"
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr "変更セットを元に戻すプラグイン"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21786,5 +21879,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21796,10 +21889,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "ルーティング能力の提供"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21808,5 +21901,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21816,16 +21909,31 @@
 "ロードし、更新を要求できます。"
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "プラグイン情報"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "現在のGPS位置上にマーカー/ノードの追加を許可"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "表形式でタグ編集のダイアログ・ボックスを提供"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21838,15 +21946,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "1つのブロックからテラスハウスを作成する"
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21855,5 +21963,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21862,5 +21970,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21869,10 +21977,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr "OSMデータベースからの削除取消を許可"
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21883,5 +21991,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21891,5 +21999,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21900,20 +22008,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "長い相互接続されたウェイのセットに沿って簡単にダウンロード"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21922,5 +22030,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22814,4 +22922,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22819,5 +22971,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "ロータリー交差点"
@@ -23324,5 +23476,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "居住区域内道路"
@@ -23371,5 +23523,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "敷地内道路"
@@ -23402,6 +23554,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "工事中"
@@ -24563,5 +24715,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "沼地、湿地"
@@ -24759,7 +24911,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "自転車"
@@ -25035,8 +25187,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "線路"
@@ -26472,5 +26624,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "駅"
@@ -27743,32 +27895,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "スポーツ"
@@ -29566,9 +29752,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "緑"
@@ -31231,5 +31417,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "地下鉄"
@@ -31510,5 +31696,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31526,5 +31712,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "破棄された"
@@ -31901,7 +32087,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "車線"
@@ -31993,9 +32179,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "敷地内道路"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32005,5 +32199,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "浅瀬（洗い越し）"
@@ -32022,7 +32216,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "車線"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "転回所"
@@ -32037,5 +32244,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr "緊急アクセスポイント"
@@ -32049,5 +32256,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "川岸"
@@ -32061,5 +32268,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "小川"
@@ -32073,5 +32280,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "ドック"
@@ -32275,14 +32482,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "人工物"
@@ -32296,5 +32503,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr "rapids"
@@ -32356,7 +32563,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "鉄道ポイント"
@@ -32379,10 +32586,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "その他の軌道"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "高架鉄道"
@@ -32416,7 +32623,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "古い軌道"
@@ -32461,6 +32668,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "空路"
@@ -32482,5 +32689,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "空路（暗色）"
@@ -32494,5 +32701,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "空路（明色）"
@@ -32570,8 +32777,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "リフト"
@@ -32587,5 +32794,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "初球者スキーコース"
@@ -32599,5 +32806,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "中級者スキーコース"
@@ -32611,5 +32818,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "上級者スキーコース"
@@ -32623,5 +32830,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr "熟練者用のゲレンデ"
@@ -32635,5 +32842,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "フリースタイルのゲレンデ"
@@ -32647,5 +32854,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "初心者スキーゲレンデ"
@@ -32765,11 +32972,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "電力"
@@ -32782,5 +32989,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "桟橋"
@@ -32794,5 +33001,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "パイプライン"
@@ -32936,13 +33143,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "レジャー"
@@ -32956,5 +33163,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "マリーナ"
@@ -33050,10 +33257,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "アメニティ"
@@ -33163,11 +33370,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "アメニティ_交通"
@@ -33605,24 +33812,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "アメニティ_信号"
@@ -33654,6 +33861,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "信号_水域"
@@ -33714,8 +33921,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "健康"
@@ -34076,26 +34283,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "店"
@@ -34167,8 +34374,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "ホテル"
@@ -34268,9 +34475,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "旅行関係"
@@ -34358,9 +34565,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "史跡"
@@ -34373,5 +34580,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "石切り場"
@@ -34385,5 +34592,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "埋め立て地"
@@ -34405,5 +34612,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "水たまり、窪地"
@@ -34417,5 +34624,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "農家の庭"
@@ -34438,5 +34645,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "小売りの商用地"
@@ -34450,5 +34657,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "工業地"
@@ -34462,5 +34669,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "使用していない工業地"
@@ -34474,5 +34681,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "緑地"
@@ -34486,5 +34693,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "鉄道公園"
@@ -34541,7 +34748,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "軍用地"
@@ -34555,5 +34762,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "共同墓地"
@@ -34566,5 +34773,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "山頂"
@@ -34579,5 +34786,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "氷河"
@@ -34591,5 +34798,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "火山"
@@ -34643,8 +34850,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "自然"
@@ -34658,5 +34865,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "低木"
@@ -34670,5 +34877,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "荒地"
@@ -34682,5 +34889,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "森林エリア"
@@ -34694,5 +34901,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "泥"
@@ -34706,5 +34913,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "砂浜"
@@ -34782,8 +34989,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "ルート"
@@ -34872,12 +35079,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "行政区境"
@@ -35027,11 +35234,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "場所"
@@ -35045,5 +35252,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr "tiger_data"
@@ -35412,4 +35619,51 @@
 msgstr "PCN 2006 - イタリア"
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "現在最大2つまでのエリアのみ結合できます。"
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "結合された自己重複エリア"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "すべての競合に値を入力してください。"
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "競合を解決する"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "エリアの結合：　短いウェイの削除"
+
+#~ msgid "Closed Way"
+#~ msgstr "閉じたウェイ"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr "エラー: サーバからのブックマークリストに予期せぬ行 ''{0}''"
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr ""
+#~ "エラー: サーバからのブックマークリストの行 ''{1}'' に不正なダブル値 "
+#~ "''{0}''"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "''{0}'' からのブックマークのロードはセキュリティ上の理由で失敗しました。例"
+#~ "外の内容: {1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>ブックマークを書き込めません。<br>{0}</html>"
+
+#~ msgid "play/pause"
+#~ msgstr "再生/停止"
+
+#~ msgid "jump"
+#~ msgstr "ジャンプ"
+
+#~ msgid "forward"
+#~ msgstr "進む"
+
 #~ msgid "Move"
 #~ msgstr "移動"
@@ -35971,7 +36225,4 @@
 #~ "最後に行った操作を取り消して、作業内容を保存し、\n"
 #~ "新しいレイヤーを新しいゾーンで開始してください。"
-
-#~ msgid "Split way segment"
-#~ msgstr "ウェイのセグメントを分割"
 
 #~ msgid ""
@@ -36373,7 +36624,4 @@
 #~ msgid "Selected makes your trace public in openstreetmap.org"
 #~ msgstr "選択したあなたのトレースは、openstreetmap.orgに公開されます。"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "間違った数のパラメータが、ノード演算子に渡されました。"
 
 #~ msgid "AgPifoJ - Geotagged pictures"
Index: /applications/editors/josm/i18n/po/nb.po
===================================================================
--- /applications/editors/josm/i18n/po/nb.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/nb.po	(revision 23252)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
 "PO-Revision-Date: 2010-09-05 23:37+0000\n"
 "Last-Translator: Anders Einar Hilden <post@anderseinar.net>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:55+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -230,5 +230,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -250,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -270,7 +269,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -393,5 +393,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -418,4 +418,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -423,5 +424,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -456,5 +457,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Informasjon"
@@ -666,8 +667,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -679,5 +680,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Slett"
@@ -853,14 +854,14 @@
 msgstr "Avslutt programmet."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Fullskjermvisning"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Slå på og av fullskjermvisning"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Slå på og av Fullskjermvisning"
@@ -903,26 +904,22 @@
 msgstr "Vis objektinformasjon om OSMs noder, linjer eller relasjoner."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Slå sammen områder med overlapp"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Slår sammen områder med overlapp"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "Velg minst én lukket linje som skal sammenføyes."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Bare to områder kan bli slått sammen foreløpig."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "«{0}» er ikke lukket, og kan derfor ikke være med i sammenføyning."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -933,5 +930,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -939,37 +936,67 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Vil du virkelig fortsette?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Angre hvis du er usikker"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Fant ingen skjæring. Ingen endringer ble gjort."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Drikke"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Fjerner doble noder …"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Noder er lagt til i alle skjæringspunkt"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Reparer relasjoner"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Slo sammen områder som overlappet seg selv"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Slo sammen overlappende områder"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -977,33 +1004,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Legg inn verdier for alle konflikter."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Løs konflikter"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Reparer konflikter i egenskaper."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Splitt linje i segment"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Fjernede Element fra Relasjoner"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Lukket linje"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Fjern egenskaper fra indre linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Funksjon Slå sammen Areal"
@@ -1504,12 +1520,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1530,6 +1545,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1564,6 +1579,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Feil"
@@ -1595,5 +1610,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1705,5 +1720,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Lukk"
@@ -1729,5 +1744,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Nei, avbryt"
@@ -1759,5 +1774,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1945,10 +1960,10 @@
 msgstr "Node uten tilknytning"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Kopier til {0} noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2343,4 +2358,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2489,17 +2505,17 @@
 msgstr[1] "Legg til og flytt en kunstig node til {0} linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Flytt elementer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Flytt dem"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Angre flytting"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2512,9 +2528,9 @@
 "Vil du virkelig flytte dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Slipp museknappen for å velge objektene i rektangelet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2523,9 +2539,9 @@
 "nærmeste node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Slipp museknappen for å avslutte rotasjon."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2991,4 +3007,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3379,5 +3396,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Ny verdi"
@@ -3450,15 +3466,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Innstillingsfil har feil i linje {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3467,5 +3483,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3474,5 +3490,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3481,5 +3497,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3488,5 +3504,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3494,5 +3510,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3501,5 +3517,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3508,5 +3524,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3515,20 +3531,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
 "Warning: Failed to initialize preferences.Failed to reset preference file to "
 "default: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 msgstr ""
 
@@ -3546,23 +3551,4 @@
 msgid "Could not load preferences from server."
 msgstr "Klarte ikke lese innstillinger fra tjener."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -3970,12 +3956,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "Feil antall parametere for nodes-operator."
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Feil ved oppretting av mappe for mellomlager: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, 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:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
 msgstr ""
 
@@ -4095,5 +4097,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "bygning"
@@ -4269,10 +4271,10 @@
 msgstr "Hvis angitt, gå til standardinnstillinger i stedet for å lese dem inn."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Brukernavn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4443,8 +4445,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4663,5 +4665,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5220,9 +5222,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5235,9 +5237,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5323,5 +5324,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "ingen"
@@ -5609,5 +5610,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5705,11 +5706,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Legg til"
@@ -6054,10 +6055,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr ""
@@ -7706,9 +7707,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Tilføy egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7717,13 +7718,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7731,10 +7732,10 @@
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Endre verdier?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7743,5 +7744,5 @@
 msgstr[1] "Endre egenskap på inntil {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7750,77 +7751,86 @@
 msgstr[1] "Dette vil endre opptil {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Velg en nøkkel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Velg en verdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 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/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Egenskaper/medlemsskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Egenskaper for valgte objekt."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Medlem av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Medlemskap"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Skift relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Slett fra relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Vil du slette utvalget fra relasjon {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøkkel i alle objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "DSlett egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Tilføy et nytt nøkkel/verdi-sett til alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Rett verdien for den valgte nøkkel for alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Egenskaper for valgte objekt."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr ""
@@ -8549,5 +8559,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9150,5 +9160,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11311,13 +11321,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Avanserte innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Endre innstillingerne direkte. Vær varsom!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11325,14 +11335,14 @@
 msgstr "Søk: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Nåværende verdi er standard."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Standardverdien er «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
@@ -11340,5 +11350,16 @@
 "enda)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Velg raden som skal slettes"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Gi en ny nøkkel med verdi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11346,20 +11367,13 @@
 msgstr "Velg raden som skal endres"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Ny verdi for {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Velg raden som skal slettes"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Gi en ny nøkkel med verdi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Verdi"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -11928,5 +11942,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Benytt innebygd standardverdier"
@@ -12396,5 +12410,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12404,10 +12423,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12417,5 +12436,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12424,5 +12443,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12431,5 +12450,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12438,9 +12457,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Meny for sortering av innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Objektmal"
@@ -14318,5 +14337,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "ingen beskrivelse tilgjengelig"
@@ -14333,5 +14352,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr ""
@@ -14702,5 +14726,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -14796,4 +14820,28 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Endre egenskaper"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Importer bilder"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Importerte bilder"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Feil ved nedlasting av {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15154,4 +15202,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15172,5 +15221,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15178,5 +15227,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -15665,8 +15714,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "vann"
@@ -15727,6 +15776,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "adresse"
@@ -16206,6 +16255,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Blankt lag"
@@ -16426,6 +16475,13 @@
 msgstr "Fant ikke GPX lag"
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+msgid "External tool error"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16448,5 +16504,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17164,5 +17220,5 @@
 msgstr "Velg minst to linjer."
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "Åpne lag"
@@ -17944,4 +18000,9 @@
 msgstr "Gi verdier for vekting"
 
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Ny verdi for {0}"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
@@ -19890,5 +19951,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "område"
@@ -20024,140 +20085,145 @@
 msgstr "{0}, …"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Spill/Pause"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Tilbake"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Neste spor"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Spill av"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Raskere"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Saktere"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20174,4 +20240,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20268,6 +20338,12 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "regulært uttrykk"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20295,5 +20371,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Meny Navn"
@@ -20304,6 +20380,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Sport"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20334,5 +20411,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "WMS URL"
@@ -20466,24 +20543,24 @@
 "Dette resulterer i feil koordinater."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS lag ({0}) laster automatisk ned i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS lag ({0})  laster ned i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20494,80 +20571,80 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Last ned synlige kartbilder"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr "Du har bestilt for stort område. Zoom inn eller bytt oppløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Bytt oppløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Last ned kartbilder med feil på nytt"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Lagre WMS lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Lagre WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "les inn WMS lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "Last inn WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Støtter ikke WMS fil versjon;fant {0}, ønsker {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Feil Fil Format"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Feil ved lasting av fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Automatisk nedlasting"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20576,5 +20653,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20584,73 +20661,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Åpne tomt WMS lag til data fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Innstillinger WMS Programtillegg"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Rediger liste over WMS-tjenere som vises i WMS-programtillegg"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "Nedlaster:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "Overlapp kartbilder"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Forstørr"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Meny Navn (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "WMS URL (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "Nedlaster:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "Overlapp kartbilder"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Fjern"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20717,5 +20805,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "skog"
@@ -21009,6 +21097,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -21018,15 +21112,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr ""
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr "En spesiell håntering for det franske landregisterets WMS tjener"
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -21042,10 +21136,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "Lag et rutenett med linjer."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -21053,10 +21147,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Lar deg importere forskjellige dataformater direkte i JOSM."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21067,15 +21161,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "Dupliser linjer med parallell avstand"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21085,20 +21179,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Last ned GPS punkt fra Globalsat dg100 data logger direkte til JOSM"
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "Bakgrunnslag som viser rutenettet i kartet"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21111,15 +21205,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "For vektorisering av  WMS bilder."
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21129,5 +21223,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21140,15 +21234,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21157,5 +21251,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21168,20 +21262,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "Viser bakgrunnsbildet i et åpent lag"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importerer tema fra OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21189,5 +21283,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21195,5 +21289,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21202,5 +21296,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21211,10 +21305,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21222,15 +21316,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "La andre program sende kommandoer til JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21240,5 +21334,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21249,10 +21343,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Gir deg Ruteplanlegger på OSM data."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21261,5 +21355,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21269,16 +21363,30 @@
 "bakgrunn og bestille oppdatering."
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+msgid "Plugin for Seamap Editor"
+msgstr ""
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Legger inn markører eller Noder på gps posisjon."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Dialog for å redigere egenskaper i en tabell."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21291,15 +21399,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "Lager rekkehus / terassehus fra en enkel husblokk."
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21308,5 +21416,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21315,5 +21423,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21322,10 +21430,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21336,5 +21444,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21344,5 +21452,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21351,20 +21459,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier."
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21373,5 +21481,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22265,4 +22373,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22270,5 +22422,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "rundkjøring"
@@ -22775,5 +22927,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "boligvei"
@@ -22822,5 +22974,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "adkomstvei"
@@ -22853,6 +23005,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "veiarbeid"
@@ -24011,5 +24163,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "myrområde"
@@ -24207,7 +24359,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "sykkel"
@@ -24483,8 +24635,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "jernbane"
@@ -25920,5 +26072,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "stasjon"
@@ -27191,32 +27343,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "sport"
@@ -29013,9 +29199,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "grønn"
@@ -30678,5 +30864,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "T-bane"
@@ -30957,5 +31143,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -30973,5 +31159,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "avleggs"
@@ -31348,7 +31534,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "traktorvei"
@@ -31440,9 +31626,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "service"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31452,5 +31646,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "vadested"
@@ -31469,7 +31663,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "traktorvei"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "vendesirkel"
@@ -31484,5 +31691,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr "redningsmøtepunkt"
@@ -31496,5 +31703,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "elvebredd"
@@ -31508,5 +31715,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "bekk"
@@ -31520,5 +31727,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "tørrdokk"
@@ -31722,14 +31929,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "menneskeskapt"
@@ -31743,5 +31950,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr "stryk"
@@ -31803,7 +32010,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "jernbanepunkt"
@@ -31826,10 +32033,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "annen bane"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "jernbanebro"
@@ -31863,7 +32070,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "nedlagt bane"
@@ -31908,6 +32115,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "luftfart"
@@ -31929,5 +32136,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "luftfart, mørk"
@@ -31941,5 +32148,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "luftfart, lys"
@@ -32017,8 +32224,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "taubane"
@@ -32034,5 +32241,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "nedfart enkel"
@@ -32046,5 +32253,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "nedfart middels"
@@ -32058,5 +32265,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "nedfart avansert"
@@ -32070,5 +32277,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr "nedfart ekspert"
@@ -32082,5 +32289,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "nedfart friløp"
@@ -32094,5 +32301,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "nedfart nybegynner"
@@ -32212,11 +32419,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "kraft"
@@ -32229,5 +32436,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "brygge"
@@ -32241,5 +32448,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "rørgate"
@@ -32383,13 +32590,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "fritid"
@@ -32403,5 +32610,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "marina"
@@ -32497,10 +32704,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "fasilitet"
@@ -32610,11 +32817,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "fasilitet – trafikk"
@@ -33052,24 +33259,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "fasilitet – lys"
@@ -33101,6 +33308,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "små vannsteder"
@@ -33161,8 +33368,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "helse"
@@ -33523,26 +33730,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "butikk"
@@ -33614,8 +33821,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hotell"
@@ -33715,9 +33922,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "turisme"
@@ -33805,9 +34012,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "historisk"
@@ -33820,5 +34027,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "steinbrudd"
@@ -33832,5 +34039,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "avfallsdeponi"
@@ -33852,5 +34059,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "vannmagasin"
@@ -33864,5 +34071,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "gårdstun"
@@ -33885,5 +34092,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "butikker"
@@ -33897,5 +34104,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "industri"
@@ -33909,5 +34116,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "rivningsområde"
@@ -33921,5 +34128,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "byggeområde"
@@ -33933,5 +34140,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "jernbanegrunn"
@@ -33988,7 +34195,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "militært"
@@ -34002,5 +34209,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "gravlund"
@@ -34013,5 +34220,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "fjelltopp"
@@ -34026,5 +34233,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "isbre"
@@ -34038,5 +34245,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "vulkan"
@@ -34090,8 +34297,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "natur"
@@ -34105,5 +34312,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "krattskog"
@@ -34117,5 +34324,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "beiteområde"
@@ -34129,5 +34336,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "skogsområde"
@@ -34141,5 +34348,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "søle"
@@ -34153,5 +34360,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "strand"
@@ -34229,8 +34436,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "rute"
@@ -34319,12 +34526,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "grense"
@@ -34474,11 +34681,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "sted"
@@ -34492,5 +34699,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr "tiger-data"
@@ -34859,4 +35066,19 @@
 msgstr ""
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Bare to områder kan bli slått sammen foreløpig."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Slo sammen områder som overlappet seg selv"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Legg inn verdier for alle konflikter."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Løs konflikter"
+
+#~ msgid "Closed Way"
+#~ msgstr "Lukket linje"
+
 #~ msgid "Move"
 #~ msgstr "Flytt"
@@ -34876,7 +35098,4 @@
 #~ msgid "JOSM Online Help"
 #~ msgstr "JOSM hjelpesider"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Feil ved nedlasting av {0}"
 
 #~ msgid ""
@@ -35546,7 +35765,4 @@
 #~ msgstr[1] "Valgt linje inneholder ikke de valgte nodene."
 
-#~ msgid "Split way segment"
-#~ msgstr "Splitt linje i segment"
-
 #~ msgid "Area style way is not closed."
 #~ msgstr "Linje for areal er ikke lukket."
@@ -35962,7 +36178,4 @@
 #~ msgid "YAHOO (WebKit GTK)"
 #~ msgstr "Yahoo (WebKit GTK)"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Feil antall parametere for nodes-operator."
 
 #~ msgid "Could not read from URL: \"{0}\""
Index: /applications/editors/josm/i18n/po/nl.po
===================================================================
--- /applications/editors/josm/i18n/po/nl.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/nl.po	(revision 23252)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
 "PO-Revision-Date: 2010-09-06 00:55+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:56+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -237,5 +237,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -257,5 +256,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -277,7 +276,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -401,5 +401,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -426,4 +426,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -431,5 +432,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -464,5 +465,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Informatie"
@@ -677,8 +678,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -690,5 +691,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Verwijderen"
@@ -867,14 +868,14 @@
 msgstr "De applicatie afsluiten."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Volledig scherm beeld"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Schakelen volledig scherm beeld"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Schakelen volledig scherm beeld"
@@ -917,26 +918,22 @@
 msgstr "Toon objectinformatie over OSM wegen, knopen of relaties."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Overlappende gebieden samenvoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Overlappende gebieden samenvoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "Selecteer op z'n minst één gesloten weg die samengevoegd moet worden."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Op dit moment kunnen maximaal twee gebieden worden samengevoegd."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" is niet gesloten en kan daarom niet worden samengevoegd."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -949,5 +946,5 @@
 "De geselecteerde wegen hebben knopen buiten de binnengehaalde kaart gegevens"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -955,37 +952,67 @@
 msgstr "Er kunnen hierdoor knopen verloren gaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Weet u het echt zeker dat u door wil gaan?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Breek af als je het niet zeker weet"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Geen kruispunt gevonden. Er is niets veranderd"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Dranken"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Dubbele knopen verwijderen..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Knooppunten toegevoegd op alle kruispunten"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Wegen die niet deel van een binnenste multipoligoon zijn verwijderd"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Relaties gerepareerd"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Zichzelf overlappend gebied samengevoegd"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Zichzelf overlappend gebied samengevoegd"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -995,33 +1022,22 @@
 "of er geen fouten zijn geïntroduceerd."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Waarden voor alle conflicten invoeren."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Conflicten oplossen"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Repareer tag conflikten"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Wegsegment splitsen"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "elementen verwijderd van relaties"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Samenvoegen gebieden: Korte wegen verwijderd"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Gesloten weg"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Tags van binnenste wegen verwijderd"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Gebied samenvoeg functie"
@@ -1548,12 +1564,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1574,6 +1589,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1608,6 +1623,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Fout"
@@ -1639,5 +1654,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1751,5 +1766,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Sluiten"
@@ -1775,5 +1790,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Neeêh, Niet doen!"
@@ -1805,5 +1820,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -2005,10 +2020,10 @@
 msgstr "Ongebonden knoop"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Duplicaat in {0} knopen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2420,4 +2435,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2570,17 +2586,17 @@
 msgstr[1] "Een virtuele knoop toevoegen en naar {0} wegen verplaatsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Verplaats elementen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Verplaats ze"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Verplaatsing ongedaan maken"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2593,9 +2609,9 @@
 "Wilt u ze echt verplaatsen?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "De muisknop loslaten om objecten in het rechthoek te selecteren."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2604,9 +2620,9 @@
 "met dichtstbijzijnde knoop."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "De muisknop loslaten om het roteren te stoppen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3092,4 +3108,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3483,5 +3500,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Nieuwe waarde"
@@ -3554,15 +3570,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Configuratiebestand is verminkt in regels {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3571,5 +3587,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3578,5 +3594,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3585,5 +3601,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3592,5 +3608,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3600,5 +3616,5 @@
 "bestand wordt aangemaakt."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3609,5 +3625,5 @@
 "standaard voorkeuren bestand."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3616,5 +3632,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3623,20 +3639,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
 "Warning: Failed to initialize preferences.Failed to reset preference file to "
 "default: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 msgstr ""
 
@@ -3654,23 +3659,4 @@
 msgid "Could not load preferences from server."
 msgstr "Kan geen voorkeuren van server laden."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4078,12 +4064,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "Onjuit aantal parameters voor knooppunten operator"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Aanmaken map voor buffergeheugen is mislukt: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, 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:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
 msgstr ""
 
@@ -4203,5 +4205,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "gebouw"
@@ -4379,10 +4381,10 @@
 "plaats van gelezen."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4555,8 +4557,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4777,5 +4779,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5306,9 +5308,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5321,9 +5323,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5409,5 +5410,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "geen"
@@ -5695,5 +5696,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5795,11 +5796,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Toevoegen"
@@ -6144,10 +6145,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr ""
@@ -7798,9 +7799,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Eigenschappen toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7809,13 +7810,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7823,10 +7824,10 @@
 msgstr "<verschillend>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Waarden aanpassen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7835,5 +7836,5 @@
 msgstr[1] "Eigenschappen van {0} objecten aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7842,77 +7843,86 @@
 msgstr[1] "Dit verandert {0} objecten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Selecteer een sleutel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Selecteer een waarde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 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/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Eigenschappen/Lidmaatschappen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Eigenschappen voor geselecteerde objecten."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Lid van"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschappen: {0} / Leden: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Eigenschappen / Leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Relatie wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Uit relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Selectie uit relatie {0} zeker verwijderen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "De geselecteerde sleutel in alle objecten verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Eigenschappen verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Een nieuwe sleutel/waarde aan alle objecten toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "De geselecteerde sleutelwaarde voor alle objecten bewerken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Eigenschappen voor geselecteerde objecten."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr ""
@@ -8642,5 +8652,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9249,5 +9259,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11415,13 +11425,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Uitgebreide voorkeuren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Voorkeuren direct instellen. Voorzichtig gebruiken!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11429,18 +11439,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Huidige waarde is standaard."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Standaardwaarde is ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr "Standaardwaarde is onbekend (instelling is nog niet gebruikt)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Selecteer een rij om te verwijderen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Nieuw sleutel/waardepaar invoeren"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11448,20 +11469,13 @@
 msgstr "Selecteer een rij om te bewerken."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Nieuwe waarde voor {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Selecteer een rij om te verwijderen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Nieuw sleutel/waardepaar invoeren"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Waarde"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12041,5 +12055,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Ingebouwde standaarden ingeschakelen"
@@ -12510,5 +12524,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Kan voorkeuzebron voor tagging niet lezen: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12518,10 +12537,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12531,5 +12550,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12538,5 +12557,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12545,5 +12564,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12552,9 +12571,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Voorinstellingenmenu sorteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Tagvoorkeuzen"
@@ -14424,5 +14443,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "geen omschrijving beschikbaar"
@@ -14439,5 +14458,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr ""
@@ -14806,5 +14830,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -14900,4 +14924,28 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Eigenschappen veranderen"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Afbeeldingen importeren"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Afbeeldingen importeren"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Fout tijdens het laden van {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15256,4 +15304,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15274,5 +15323,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15280,5 +15329,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -15763,8 +15812,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "water"
@@ -15825,6 +15874,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "adres"
@@ -16304,6 +16353,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Lege laag"
@@ -16523,6 +16572,13 @@
 msgstr "Geen GPX-gegevenslaag gevonden."
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+msgid "External tool error"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16545,5 +16601,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17262,5 +17318,5 @@
 msgstr ""
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -18040,4 +18096,9 @@
 msgid "Enter weight values"
 msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Nieuwe waarde voor {0}"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
@@ -19989,5 +20050,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "gebied"
@@ -20127,140 +20188,145 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Afspelen/Pauzeren"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Achteruit"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Naar voren springen"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Vooruit"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Sneller"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Langzamer"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20277,4 +20343,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20371,6 +20441,12 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Geef de zoekterm"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20398,5 +20474,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Menunaam"
@@ -20407,6 +20483,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Sportfaciliteiten"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20437,5 +20514,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "WMS-URL"
@@ -20570,24 +20647,24 @@
 "Dat kan tot foutieve coördinaten leiden."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-laag ({0}), automatisch in zoom {1} downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-laag ({0}), in zoom {1} downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20598,17 +20675,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Zichtbare tegels downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20616,63 +20693,63 @@
 "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Resolutie veranderen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Foutieve tegels herladen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "WMS-laag in bestand opslaan"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "WMS-laag uit bestand laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Niet-ondersteunde WMS-bestandsversie; is {0}, verwachtte {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Fout in bestandsindeling"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Laden bestand is mislukt"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Automatisch downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20681,5 +20758,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20689,74 +20766,85 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 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"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Voorkeuren WMS-plugin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 "Lijst met WMS-servers bewerken die in het WMS-pluginmenu worden getoond"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Menunaam (standaard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "WMS-URL (standaard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Verwijderen"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20823,5 +20911,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "bosbouw"
@@ -21115,6 +21203,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -21124,15 +21218,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr ""
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -21144,10 +21238,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -21155,10 +21249,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21167,15 +21261,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21184,20 +21278,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21207,15 +21301,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21223,5 +21317,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21231,15 +21325,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21248,5 +21342,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21256,20 +21350,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21277,5 +21371,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21283,5 +21377,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21290,5 +21384,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21297,10 +21391,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21308,15 +21402,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21326,5 +21420,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21333,10 +21427,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21345,5 +21439,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21351,16 +21445,30 @@
 msgstr ""
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+msgid "Plugin for Seamap Editor"
+msgstr ""
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21370,15 +21478,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21387,5 +21495,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21394,5 +21502,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21401,10 +21509,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21413,5 +21521,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21421,5 +21529,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21428,20 +21536,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21450,5 +21558,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22342,4 +22450,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22347,5 +22499,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "rotonde"
@@ -22852,5 +23004,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "woongebied"
@@ -22899,5 +23051,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "toegangsweg"
@@ -22930,6 +23082,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "werkzaamheden"
@@ -24088,5 +24240,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "moeras"
@@ -24284,7 +24436,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "fiets"
@@ -24560,8 +24712,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "spoor"
@@ -25997,5 +26149,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "terminal"
@@ -27268,32 +27420,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "sport"
@@ -29090,9 +29276,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "groen"
@@ -30755,5 +30941,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "metro"
@@ -31034,5 +31220,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31050,5 +31236,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "vervallen"
@@ -31425,7 +31611,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "snelwegroute"
@@ -31517,9 +31703,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr ""
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31529,5 +31723,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr ""
@@ -31546,7 +31740,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "snelwegroute"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "Omkeermogelijkheid"
@@ -31561,5 +31768,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr ""
@@ -31573,5 +31780,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "rivierbank"
@@ -31585,5 +31792,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "stroom"
@@ -31597,5 +31804,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "dok"
@@ -31799,14 +32006,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "kunstmatig"
@@ -31820,5 +32027,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -31880,7 +32087,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "spoorwegpunt"
@@ -31903,10 +32110,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "ander spoor"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "spoorovergang"
@@ -31940,7 +32147,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "oud spoor"
@@ -31985,6 +32192,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "luchtverbinding"
@@ -32006,5 +32213,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "luchtverbinding_donker"
@@ -32018,5 +32225,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "luchtverbinding_licht"
@@ -32094,8 +32301,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "kabelbaan"
@@ -32111,5 +32318,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "piste_eenvoudig"
@@ -32123,5 +32330,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "piste_middelmatig"
@@ -32135,5 +32342,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "piste_gevorderden"
@@ -32147,5 +32354,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr ""
@@ -32159,5 +32366,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "piste_vrijekuur"
@@ -32171,5 +32378,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "piste_beginner"
@@ -32289,11 +32496,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "kracht"
@@ -32306,5 +32513,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "pijler"
@@ -32318,5 +32525,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "pijplijn"
@@ -32460,13 +32667,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "vrije tijd"
@@ -32480,5 +32687,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "jachthaven"
@@ -32574,10 +32781,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "voorziening"
@@ -32687,11 +32894,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "voorziening_verkeer"
@@ -33129,24 +33336,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "voorziening_licht"
@@ -33178,6 +33385,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "licht_water"
@@ -33238,8 +33445,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "gezondheid"
@@ -33600,26 +33807,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "winkel"
@@ -33691,8 +33898,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hotel"
@@ -33792,9 +33999,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "toerisme"
@@ -33882,9 +34089,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "historisch"
@@ -33897,5 +34104,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "mijnbouw"
@@ -33909,5 +34116,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "vuilstortplaats"
@@ -33929,5 +34136,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "estuarium"
@@ -33941,5 +34148,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "landbouwgrond"
@@ -33962,5 +34169,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "winkelcentrum"
@@ -33974,5 +34181,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "industrieel"
@@ -33986,5 +34193,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "braakliggend gebied"
@@ -33998,5 +34205,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "ontwikkelingsgebied"
@@ -34010,5 +34217,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "Rangeerterrein"
@@ -34065,7 +34272,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "militair gebruik"
@@ -34079,5 +34286,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "begraafplaats"
@@ -34090,5 +34297,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "berg of -heuveltop"
@@ -34103,5 +34310,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "gletsjer"
@@ -34115,5 +34322,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "vulkaan"
@@ -34167,8 +34374,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "Natuurlijk"
@@ -34182,5 +34389,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "ruig land"
@@ -34194,5 +34401,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "heide"
@@ -34206,5 +34413,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "houtland"
@@ -34218,5 +34425,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "slikgronden"
@@ -34230,5 +34437,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "strand"
@@ -34306,8 +34513,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "route"
@@ -34396,12 +34603,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "grens"
@@ -34551,11 +34758,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "plaats"
@@ -34569,5 +34776,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -34936,4 +35143,22 @@
 msgstr ""
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Op dit moment kunnen maximaal twee gebieden worden samengevoegd."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Zichzelf overlappend gebied samengevoegd"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Waarden voor alle conflicten invoeren."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Conflicten oplossen"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Samenvoegen gebieden: Korte wegen verwijderd"
+
+#~ msgid "Closed Way"
+#~ msgstr "Gesloten weg"
+
 #~ msgid "Select a bookmark first."
 #~ msgstr "Selecteer eerst een bladwijzer."
@@ -35183,7 +35408,4 @@
 #~ msgid "Conflicting relation"
 #~ msgstr "Conflicterende relatie"
-
-#~ msgid "Split way segment"
-#~ msgstr "Wegsegment splitsen"
 
 #~ msgid "Degrees Minutes Seconds"
@@ -35599,7 +35821,4 @@
 #~ 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"
@@ -36030,7 +36249,4 @@
 #~ "aantal tags, of bereik, bijvoorbeeld tags:1 of  tags:2-5"
 
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Onjuit aantal parameters voor knooppunten operator"
-
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Onjuiste waarde van id operator: {0}. Verwachtte nummer"
Index: /applications/editors/josm/i18n/po/pl.po
===================================================================
--- /applications/editors/josm/i18n/po/pl.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/pl.po	(revision 23252)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
-"PO-Revision-Date: 2010-09-07 12:19+0000\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
+"PO-Revision-Date: 2010-09-12 13:43+0000\n"
 "Last-Translator: Paweł Marynowski <yarl@o2.pl>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -239,5 +239,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -259,5 +258,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -279,7 +278,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -402,5 +402,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -427,4 +427,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -432,5 +433,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -465,5 +466,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Informacje"
@@ -677,8 +678,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -690,5 +691,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Usuń"
@@ -866,14 +867,14 @@
 msgstr "Kończy pracę z programem."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Pełny ekran"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Przełącza na pełny ekran"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Przełącza na pełny ekran"
@@ -916,27 +917,23 @@
 msgstr "Wyświetl informacje obiektowe o węźle, drodze lub relacji OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Połącz nakładające się obszary"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Łączy nakładające się obszary"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
 "Proszę wybrać co najmniej jedną zamkniętą drogę, która powinna być połączona"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Można połączyć jednocześnie tylko dwa nakładające się obszary"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" nie jest połączona i z tego powodu nie można połączyć obszarów"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -948,5 +945,5 @@
 msgstr[2] "Zaznaczone drogi posiadają węzły poza pobranym obszarem."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -954,37 +951,67 @@
 msgstr "Może to spowodować przypadkowe usunięcie węzłów."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Kontynuować?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Przerwij jeśli nie jesteś pewien"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Brak części wspólnej. Nic nie zmieniono."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Tworzenie zestawu zmian..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Powielone węzły"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Dodano węzły na wszystkich przecięciach"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Popraw relacje"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Połączono nakładające się obszary"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Połączono nakładające się na siebie obszary"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -994,33 +1021,22 @@
 "sprawdzić czy wprowadzone zmiany nie spowodowały błędów."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Podaj wartości dla wszystkich konfliktów."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Rozwiąż konflikty"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Popraw konflikty tagów"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Rozdziel segmenty drogi"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Usuń Element z Relacji"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Połącz obszary: Usuń krótkie drogi"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Droga zamknięta"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Usunięto tagi z dróg wewnętrznych"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Funkcja łączenia obszarów"
@@ -1540,12 +1556,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1566,6 +1581,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1600,6 +1615,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Błąd"
@@ -1631,5 +1646,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1742,5 +1757,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Zamknij"
@@ -1766,5 +1781,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Nie, przerwij"
@@ -1796,5 +1811,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1986,10 +2001,10 @@
 msgstr "Rozdzielenie węzła"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Rozmnóż w {0} węzłów"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2403,4 +2418,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2550,17 +2566,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Więcej elementów"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Przesuń je"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Cofnij przesunięcie"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2573,9 +2589,9 @@
 "Czy na pewno je przesunąć?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Zwolnij przycisk myszki, aby zaznaczyć obiekty w kwadracie."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2584,9 +2600,9 @@
 "najbliższym węzłem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Zwolnij przycisk myszy aby zakończyć obracanie."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3049,4 +3065,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3440,5 +3457,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Nowa wartość"
@@ -3511,15 +3527,15 @@
 msgstr "Niewłaściwa wartość długości geograficznej \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, 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:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3530,5 +3546,5 @@
 "jest folderem."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3539,5 +3555,5 @@
 "folderem.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3548,5 +3564,5 @@
 "brakującego katalogu ustawień: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3557,5 +3573,5 @@
 "katalogu ustawień: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3564,5 +3580,5 @@
 "Ostrzeżenie: Brak pliku ustawień''{0}''. Tworzenie pliku ustawień domyślnych."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3573,5 +3589,5 @@
 "domyślnych."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3582,5 +3598,5 @@
 "ustawień domyślnych: {0} </ html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3591,5 +3607,5 @@
 "<br> {0} <br> i tworzenia nowego pliku ustawień domyślnych.</ html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3599,15 +3615,4 @@
 "Ostrzeżenie: Nie można zainicjować ustawień.\r\n"
 "Nie udało się przywrócić pliku ustawień domyślnych: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3624,23 +3629,4 @@
 msgid "Could not load preferences from server."
 msgstr "Pobranie preferencji z serwera nie powiodło się."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4054,12 +4040,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, 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:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
 msgstr ""
 
@@ -4180,5 +4180,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "budynek"
@@ -4349,10 +4349,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4526,8 +4526,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4752,5 +4752,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5297,9 +5297,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5312,9 +5312,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5400,5 +5399,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr ""
@@ -5697,5 +5696,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5793,11 +5792,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Dodaj"
@@ -6142,10 +6141,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "Zaznacz na liście relacji"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr ""
@@ -7799,9 +7798,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Dodaj właściwości"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7811,13 +7810,13 @@
 msgstr[2] "Zmiana zostanie zastosowana do {0} obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "Pusta wartość usunie znacznik."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7825,10 +7824,10 @@
 msgstr "<różne>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Zmienić wartości?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7838,5 +7837,5 @@
 msgstr[2] "Zmiana właściwości {0} obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7846,77 +7845,86 @@
 msgstr[2] "Zmiana zostanie zastosowana do {0} obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Proszę wybierz klucz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Proszę wybierz wartość"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 msgid "Please select the objects you want to change properties for."
 msgstr "Zaznacz obiekty, których właściwości chcesz zmienić."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Właściwości/członkostwo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Otwiera właściwości zaznaczonego obiektu"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Członek"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Właściwości: {0} / członkostwo: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Właściwości / członkostwo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Zmień relację"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Usuń z relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Na pewno usunąć zaznaczenie z relacji {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Usuń wybrany klucz ze wszystkich obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Usuń właściwość"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Dodaj nową parę nazwa/wartość do wszystkich obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edytuj wartość wybranego klucza dla wszystkich obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Otwiera właściwości zaznaczonego obiektu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "Zaznacz relację"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr ""
@@ -8651,5 +8659,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9240,5 +9248,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11410,13 +11418,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Ustawienia zaawansowane"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Bezpośrednie, ręczne ustawianie preferencji. Należy używać ostrożnie!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11424,14 +11432,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Ustawiona wartość jest wartością domyślną."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Domyślną wartością jest \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
@@ -11439,5 +11447,16 @@
 "użyte)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Proszę wybrać wiersz do usunięcia"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Podaj nowy klucz i jego wartość"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11445,20 +11464,13 @@
 msgstr "Proszę wybrać wiersz do edycji"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Nowa wartość dla {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Proszę wybrać wiersz do usunięcia"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Podaj nowy klucz i jego wartość"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Wartość"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12019,5 +12031,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr ""
@@ -12495,5 +12507,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Nie można odczytać źródła szablonów: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12503,10 +12520,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12516,5 +12533,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12523,5 +12540,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12530,5 +12547,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12537,9 +12554,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Sortuj menu szablonów"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Szablony"
@@ -14436,5 +14453,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "brak opisu"
@@ -14453,5 +14470,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "Wiecej informacji..."
@@ -14829,5 +14851,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -14923,4 +14945,28 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Zmień właściwości"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Importuj obrazki"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Wczytane obrazy"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Bład w czasie pobierania obrazów z katalogu {0}\n"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15279,4 +15325,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15297,5 +15344,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15303,5 +15350,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -15786,8 +15833,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "woda"
@@ -15848,6 +15895,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "adres"
@@ -16310,6 +16357,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Pusta warstwa"
@@ -16527,6 +16574,14 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Wewnętrzny błąd serwera"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16549,5 +16604,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17252,5 +17307,5 @@
 msgstr ""
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -18024,4 +18079,9 @@
 msgid "Enter weight values"
 msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Nowa wartość dla {0}"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
@@ -19961,5 +20021,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "obszar"
@@ -20096,140 +20156,145 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Odtwórz / wstrzymaj"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Wstecz"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Przeskakuje do następnego fragmentu."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Do przodu"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Szybciej"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Wolniej"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20246,4 +20311,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20340,6 +20409,12 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Wpisz szukane wyrażenie"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20367,5 +20442,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Nazwa w menu"
@@ -20376,6 +20451,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Obiekty sportowe"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20406,5 +20482,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "Adres serwera WMS"
@@ -20538,24 +20614,24 @@
 "Może to spowodować powstanie błędnych współrzędnych."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Warstwa WMS ({0}), automatycznie pobrana w powiększeniu {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Warstwa WMS ({0}), pobrana w powiększeniu {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20566,80 +20642,80 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Pobierz widoczne kafle"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Zmień rozdzielczość"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Wczytaj ponownie błędne kafle"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Kanał alfa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Zapisz warstwę WMS do pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Zapisz plik"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Otwórz warstwę WMS z pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "Otwórz warstwę WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Nieosługiwana wersja pliku WMS; znaleziono {0}, oczekiwano {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Błędny format pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Błąd podczas ładowania pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "Ustaw zakładkę WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Automatyczne pobieranie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20648,5 +20724,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20656,73 +20732,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Tworzy pustą warstwę WMS do załadowania danych z pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Ustawienia wtyczki WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Zmodyfikuj listę serwerów WMS wyświetlanych w menu wtyczki WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "Kopiuj zaznaczony serwer do menu"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "Wybierz co najmniej jeden wiersz do skopiowania."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Powiększ"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Nazwa w menu (domyślna)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "URL WMS (domyślny)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "Kopiuj zaznaczony serwer do menu"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "Wybierz co najmniej jeden wiersz do skopiowania."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Usuń"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20785,5 +20872,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "las"
@@ -21077,6 +21164,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -21086,15 +21179,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr "Narzedzie do rysowania budynków."
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -21106,10 +21199,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -21117,10 +21210,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21129,15 +21222,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21146,20 +21239,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21169,15 +21262,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21185,5 +21278,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21193,15 +21286,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21212,5 +21305,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21220,20 +21313,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importuje zgłoszone problemy z OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21241,5 +21334,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21247,5 +21340,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21254,5 +21347,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21261,10 +21354,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21272,15 +21365,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Pozwala wysyłać innym aplikaciom polecenia do JOSM"
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21290,5 +21383,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21297,10 +21390,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21309,5 +21402,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21315,16 +21408,31 @@
 msgstr ""
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "Informacje o wtyczce"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21334,15 +21442,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21351,5 +21459,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21358,5 +21466,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21365,10 +21473,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21377,5 +21485,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21385,5 +21493,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21394,20 +21502,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21416,5 +21524,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22308,4 +22416,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22313,5 +22465,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "rondo"
@@ -22818,5 +22970,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "droga lokalna"
@@ -22865,5 +23017,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "droga serwisowa"
@@ -22896,6 +23048,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "w budowie"
@@ -24054,5 +24206,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "marsze"
@@ -24250,7 +24402,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr ""
@@ -24526,8 +24678,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "kolej"
@@ -25963,5 +26115,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "terminal"
@@ -27234,32 +27386,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "Sport"
@@ -29056,9 +29242,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "zielony"
@@ -30721,5 +30907,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "metro"
@@ -31000,5 +31186,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31016,5 +31202,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "przestarzały"
@@ -31391,7 +31577,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr ""
@@ -31483,9 +31669,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "serwis"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31495,5 +31689,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr ""
@@ -31512,7 +31706,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "peron kolejowy"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr ""
@@ -31527,5 +31734,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr ""
@@ -31539,5 +31746,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "koryto rzeczne"
@@ -31551,5 +31758,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "strumień"
@@ -31563,5 +31770,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "Dok"
@@ -31765,14 +31972,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr ""
@@ -31786,5 +31993,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -31846,7 +32053,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr ""
@@ -31869,10 +32076,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr ""
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr ""
@@ -31906,7 +32113,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "stare szyny kolejowe"
@@ -31951,6 +32158,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr ""
@@ -31972,5 +32179,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr ""
@@ -31984,5 +32191,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr ""
@@ -32060,8 +32267,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "droga powietrzna"
@@ -32077,5 +32284,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr ""
@@ -32089,5 +32296,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr ""
@@ -32101,5 +32308,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr ""
@@ -32113,5 +32320,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr ""
@@ -32125,5 +32332,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr ""
@@ -32137,5 +32344,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr ""
@@ -32255,11 +32462,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "energia"
@@ -32272,5 +32479,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "nabrzeże"
@@ -32284,5 +32491,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr ""
@@ -32426,13 +32633,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "wypoczynek"
@@ -32446,5 +32653,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "marina"
@@ -32540,10 +32747,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "udogodnienie"
@@ -32653,11 +32860,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr ""
@@ -33095,24 +33302,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr ""
@@ -33144,6 +33351,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr ""
@@ -33204,8 +33411,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "zdrowie"
@@ -33566,26 +33773,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "sklep"
@@ -33657,8 +33864,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hotel"
@@ -33758,9 +33965,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "turystyka"
@@ -33848,9 +34055,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "historia"
@@ -33863,5 +34070,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "kamieniołom"
@@ -33875,5 +34082,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "Wysypisko smieci"
@@ -33895,5 +34102,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "Basen"
@@ -33907,5 +34114,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "Gospodarstwo"
@@ -33928,5 +34135,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr ""
@@ -33940,5 +34147,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "Teren przemysłowy"
@@ -33952,5 +34159,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "teren poprzemysłowy"
@@ -33964,5 +34171,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr ""
@@ -33976,5 +34183,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "Teren kolejowy"
@@ -34031,7 +34238,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "Teren wojskowy"
@@ -34045,5 +34252,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "Cmentarz"
@@ -34056,5 +34263,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "Szczyt"
@@ -34069,5 +34276,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "Lodowiec"
@@ -34081,5 +34288,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "Wulkan"
@@ -34133,8 +34340,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr ""
@@ -34148,5 +34355,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "Zarośla"
@@ -34160,5 +34367,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "Zdrowie"
@@ -34172,5 +34379,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr ""
@@ -34184,5 +34391,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "Błoto"
@@ -34196,5 +34403,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "Plaża"
@@ -34272,8 +34479,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "droga"
@@ -34362,12 +34569,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "granica"
@@ -34517,11 +34724,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "Miejsce"
@@ -34535,5 +34742,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -34902,4 +35109,22 @@
 msgstr ""
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Można połączyć jednocześnie tylko dwa nakładające się obszary"
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Połączono nakładające się obszary"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Podaj wartości dla wszystkich konfliktów."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Rozwiąż konflikty"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Połącz obszary: Usuń krótkie drogi"
+
+#~ msgid "Closed Way"
+#~ msgstr "Droga zamknięta"
+
 #~ msgid "Move"
 #~ msgstr "Przenieś"
@@ -35313,7 +35538,4 @@
 #~ msgid "Degrees Minutes Seconds"
 #~ msgstr "Stopnie minuty sekundy"
-
-#~ msgid "Split way segment"
-#~ msgstr "Rozdziel segmenty drogi"
 
 #~ msgid ""
Index: /applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- /applications/editors/josm/i18n/po/pt_BR.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/pt_BR.po	(revision 23252)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
 "PO-Revision-Date: 2010-09-06 01:35+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:56+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -238,5 +238,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -258,5 +257,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -278,7 +277,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -401,5 +401,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -426,4 +426,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -431,5 +432,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -464,5 +465,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Informação"
@@ -676,8 +677,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -689,5 +690,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Excluir"
@@ -865,14 +866,14 @@
 msgstr "Sair do aplicativo."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Visualização em tela cheia"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Ativa/desativa visualização em tela cheia"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Ativa/desativa visualização em tela cheia"
@@ -916,26 +917,22 @@
 msgstr "Mostrar informações de objeto sobre nós, caminhos ou relações do OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Unir áreas sobrepostas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Unir áreas que se sobrepõem"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "Por favor, selecione ao menos um caminho fechado que deve ser unido."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Somente o máximo de duas áreas podem ser unidas no momento."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" não está fechado e não pode ser unido."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -946,5 +943,5 @@
 msgstr[1] "Os caminhos selecionados têm nós fora da área de download definida."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -952,37 +949,67 @@
 msgstr "Isto pode levar a nós apagados acidentalmente."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Tem certeza que quer continuar?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Por favor, aborte se não está confiante"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Não foi encontrada intersecção. Nada foi alterado."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Criando conjunto de modificações..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Unir nós duplicados?"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Nó adicionado em todas intersecções"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Eliminar caminhos que não fazem parte de um multipolígono interior"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Consertar relações"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Fundir área sobreposta consigo mesma"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Fundir áreas sobrepostas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -992,33 +1019,22 @@
 "verifique se não foram introduzidos erros."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Entrada de valores para todos conflitos"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Resolver conflitos"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Consertar conflito de etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Dividir segmento de via"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Eliminar elementos de relações"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Juntas Áreas: Remover Caminhos Curtos"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Vía Fechada"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Eliminar etiquetas de caminhos internos"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Função Juntar Áreas"
@@ -1548,12 +1564,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1574,6 +1589,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1608,6 +1623,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Erro"
@@ -1639,5 +1654,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1751,5 +1766,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Fechar"
@@ -1775,5 +1790,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Não, abortar"
@@ -1805,5 +1820,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -2002,10 +2017,10 @@
 msgstr "Nó não grudado"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Duplicar em {0} nós"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2419,4 +2434,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2568,17 +2584,17 @@
 msgstr[1] "Adicionar e mover um novo nó virtual a {0} caminhos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Mover elementos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Mova-os"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Desfazer mover"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2591,9 +2607,9 @@
 "Quer realmente move-los?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 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."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2602,9 +2618,9 @@
 "próximo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Solte o botão do mouse para parar de girar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3104,4 +3120,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3497,5 +3514,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Novo valor"
@@ -3572,15 +3588,15 @@
 msgstr "Valor de longitude ilegal \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Aviso: falha ao persistir preferências para \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, 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:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3591,5 +3607,5 @@
 "\"{0}\" não é uma directória."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3600,5 +3616,5 @@
 "preferência \"{0}\" não é uma directória.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3609,5 +3625,5 @@
 "falta da directória da preferência: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3618,5 +3634,5 @@
 "devido a falta da directória da preferência: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3626,5 +3642,5 @@
 "preferências base."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3635,5 +3651,5 @@
 "ficheiro de preferência base."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3644,5 +3660,5 @@
 "de preferências base: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3654,5 +3670,5 @@
 "preferências base.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3662,17 +3678,4 @@
 "Aviso: Falha a inicializar as preferências. Falha no reset do ficheiro de "
 "preferências para original: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Erro: Linha ''{0}'' inesperada em arquivo de bookmarks ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Erro: Valor double ilegal ''{0}'' na linha ''{1}'' do arquivo de bookmark "
-"''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3689,26 +3692,4 @@
 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:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr "Erro: Linha ''{0}'' inesperada na lista de bookmarks do servidor"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-"Erro: Valor real ilegal \"{0}\" na linha \"{1}\" na lista de favoritos do "
-"servidor"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"Falha ao carregar favoritos de \"{0}\" por razões de segurança. Exceção: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4136,14 +4117,31 @@
 msgstr "Sistema Geodésico UTM"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "Número de parametros incorreto para operador de nós."
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Erro: Linha ''{0}'' inesperada em arquivo de bookmarks ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Erro: Valor double ilegal ''{0}'' na linha ''{1}'' do arquivo de bookmark "
+"''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 "<html>Não foi possível ler favoritos de<br>''{0}''<br>O erro foi: {1}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>Não foi possível gravar favorito.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4262,5 +4260,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "prédio"
@@ -4437,10 +4435,10 @@
 msgstr "Se especificado, resetar configuração ao invés de carregá-la."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Nome do Usuário"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4622,8 +4620,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4851,5 +4849,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5421,9 +5419,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5436,9 +5434,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5524,5 +5521,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "nenhum"
@@ -5839,5 +5836,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5945,11 +5942,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Adicionar"
@@ -6294,10 +6291,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "Selecionar na lista de relações"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "Selecionar uma relação na lista de relações"
@@ -8023,9 +8020,9 @@
 msgstr "Esta URL de pesquisa de conjunto de modificações é inválido"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Adicionar Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -8034,13 +8031,13 @@
 msgstr[1] "Isto vai mudar até {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "Um valor vazio deleta a tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -8048,10 +8045,10 @@
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Modificar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -8060,5 +8057,5 @@
 msgstr[1] "Modificar propriedades de até {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -8067,77 +8064,86 @@
 msgstr[1] "Isto modificará {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Por favor, selecione uma chave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Por favor, selecione um valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 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/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Propriedades/Associações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Propriedades dos objetos selecionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Membro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr "Posição"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriedades: {0} / Membros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Propriedades / Associações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Modificar relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Deletar da relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Confirmar a exclusão da relação {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Excluir a chave selecionada em todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Excluir Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Adicionar um novo par chave/valor para todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar o valor da chave selecionada para todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Propriedades dos objetos selecionados."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "Selecionar relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "Selecione a relação na seleção principal."
@@ -8911,5 +8917,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9564,5 +9570,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11890,13 +11896,13 @@
 msgstr "Recebendo informações do usuário..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Preferências Avançadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Configurando Preferências diretamente. Use com cuidado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11904,19 +11910,30 @@
 msgstr "Pesquisar: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Valor atual é o padrão."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Valor padrão é \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
 "Valor padrão atual é desconhecido (preferências não foram usadas ainda)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Por favor, selecione a linha para apagar."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Digite um novo par chave/valor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11924,20 +11941,13 @@
 msgstr "Por favor, selecione a linha para editar."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Novo valor para {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Por favor, selecione a linha para apagar."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Digite um novo par chave/valor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Valor"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12516,5 +12526,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Habilitar padrões embutidos"
@@ -12991,5 +13001,10 @@
 msgstr "Aviso: formato de entrada na lista estilos ilegal \"{0}\". Tem \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Não foi possível ler a fonte de preferência de tags: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -13001,10 +13016,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr "Não foi possível ler a tag fonte pré-definida: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -13017,5 +13032,5 @@
 "{2}]{3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -13024,5 +13039,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -13031,5 +13046,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -13038,9 +13053,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Ordenar menu de predefinições"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Padrões de predefinições"
@@ -14953,5 +14968,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "sem descrição disponível"
@@ -14970,5 +14985,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "Mais informações..."
@@ -15353,5 +15373,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -15453,4 +15473,28 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Alterar propriedades"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Importar imagens"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Georreferenciamento da imagem"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Erro ao criar o backup da camada removida: {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15814,4 +15858,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15832,5 +15877,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15838,5 +15883,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -16323,8 +16368,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "água"
@@ -16385,6 +16430,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "endereço"
@@ -16855,6 +16900,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Camada vazia"
@@ -17072,6 +17117,14 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Erro interno do servidor"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -17094,5 +17147,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17797,5 +17850,5 @@
 msgstr ""
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -18569,4 +18622,9 @@
 msgstr ""
 
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Novo valor para {0}"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
@@ -20540,5 +20598,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr ""
@@ -20675,140 +20733,145 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Tocar/Pausar"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Voltar"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Pular a frente"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Avançar"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Mais rápido"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Lento"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20825,4 +20888,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20919,6 +20986,12 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Digite uma expressão de busca"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20946,5 +21019,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Nome do Menu"
@@ -20955,6 +21028,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Violação de Capacidades da API"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20985,5 +21059,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "URL do WMS"
@@ -21115,24 +21189,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -21143,80 +21217,80 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "Sim, buscar imagens"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "URL inválido?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Baixar imagens visíveis"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Mudar resolução"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Recarregar imagens erradas"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Canal alfa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Salvar camada WMS para arquivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Salvar camada WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Carregar camada WMS de um arquivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "Carregar camada WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Erro no formato do arquivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Erro ao carregar arquivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "Adicionar marcador para esta camada WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Download automático"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -21225,5 +21299,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -21233,73 +21307,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Abrir uma camada WMS em branco para carregar dados de um arquivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Preferências do plugin WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Modifica a lista de servidores WMS exibidos no menu do plugin WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "Copiar o(s) padrão(ões) selecionados"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "Por gentileza selecione ao menos uma linha para copiar."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "Recebedor:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "% ao leste:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "% ao norte:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Ampliar"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Nome do Menu (Padrão)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "URL do WMS (Padrão)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "Copiar o(s) padrão(ões) selecionados"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "Por gentileza selecione ao menos uma linha para copiar."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "Recebedor:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "% ao leste:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "% ao norte:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Remover"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21364,5 +21449,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "floresta"
@@ -21656,6 +21741,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -21668,15 +21759,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr ""
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -21688,10 +21779,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "Cria uma grade de caminhos."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -21699,10 +21790,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Permite importar vários formatos de arquivos diretamente no JOSM."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21713,15 +21804,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "Duplicar vias com um Offset"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21732,20 +21823,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21755,15 +21846,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21773,5 +21864,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21781,15 +21872,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21798,5 +21889,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21806,20 +21897,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "Mostrar imagens de fundo do OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importar problemas do OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21827,5 +21918,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21833,5 +21924,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21842,5 +21933,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21851,10 +21942,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "O grande pacote de itens de aparência JGoodies Plastic."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21862,15 +21953,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Permite que outros aplicativos enviem comandos para o JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21880,5 +21971,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21887,10 +21978,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Possibilita capacidade de roteamento."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21899,5 +21990,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21905,16 +21996,31 @@
 msgstr ""
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "Informações sobre o plugin"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21924,15 +22030,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21941,5 +22047,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21948,5 +22054,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21957,10 +22063,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21969,5 +22075,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21977,5 +22083,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21984,20 +22090,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22006,5 +22112,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22900,4 +23006,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22905,5 +23055,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "rotatória"
@@ -23410,5 +23560,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr ""
@@ -23457,5 +23607,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "serviço"
@@ -23488,6 +23638,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "construção"
@@ -24646,5 +24796,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr ""
@@ -24842,7 +24992,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "bicicleta"
@@ -25118,8 +25268,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "trilho"
@@ -26555,5 +26705,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "terminal"
@@ -27826,32 +27976,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "esporte"
@@ -29648,9 +29832,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "verde"
@@ -31313,5 +31497,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "Metrô"
@@ -31592,5 +31776,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31608,5 +31792,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "depreciado"
@@ -31983,7 +32167,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "trilha_autoestrada"
@@ -32075,9 +32259,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "serviços"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32087,5 +32279,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "travessia de rio"
@@ -32104,7 +32296,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "trilha_autoestrada"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "rótula"
@@ -32119,5 +32324,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr ""
@@ -32131,5 +32336,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "margem de rio"
@@ -32143,5 +32348,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "fluxo"
@@ -32155,5 +32360,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "doca"
@@ -32357,14 +32562,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr ""
@@ -32378,5 +32583,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -32438,7 +32643,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "ponto de ferrovia"
@@ -32461,10 +32666,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr ""
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr ""
@@ -32498,7 +32703,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr ""
@@ -32543,6 +32748,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "aerovia"
@@ -32564,5 +32769,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "aerovia_escuro"
@@ -32576,5 +32781,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "aerovia_claro"
@@ -32652,8 +32857,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr ""
@@ -32669,5 +32874,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "pista_fácil"
@@ -32681,5 +32886,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "pista_intermediária"
@@ -32693,5 +32898,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "pista_avançada"
@@ -32705,5 +32910,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr ""
@@ -32717,5 +32922,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "pista_livre"
@@ -32729,5 +32934,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "pista_novatos"
@@ -32847,11 +33052,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "energia"
@@ -32864,5 +33069,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "embarcadouro"
@@ -32876,5 +33081,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "canalização"
@@ -33018,13 +33223,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "lazer"
@@ -33038,5 +33243,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "marina"
@@ -33132,10 +33337,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr ""
@@ -33245,11 +33450,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr ""
@@ -33687,24 +33892,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr ""
@@ -33736,6 +33941,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr ""
@@ -33796,8 +34001,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "saúde"
@@ -34158,26 +34363,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "loja"
@@ -34249,8 +34454,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hotel"
@@ -34350,9 +34555,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "turismo"
@@ -34440,9 +34645,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "histórico"
@@ -34455,5 +34660,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr ""
@@ -34467,5 +34672,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "aterro"
@@ -34487,5 +34692,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr ""
@@ -34499,5 +34704,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "fazenda"
@@ -34520,5 +34725,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "venda"
@@ -34532,5 +34737,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "industrial"
@@ -34544,5 +34749,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "Área contaminada"
@@ -34556,5 +34761,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "campo"
@@ -34568,5 +34773,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr ""
@@ -34623,7 +34828,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "exército"
@@ -34637,5 +34842,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "Cemitério"
@@ -34648,5 +34853,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "cume"
@@ -34661,5 +34866,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "geleira"
@@ -34673,5 +34878,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "vulcão"
@@ -34725,8 +34930,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr ""
@@ -34740,5 +34945,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "arbusto"
@@ -34752,5 +34957,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr ""
@@ -34764,5 +34969,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr ""
@@ -34776,5 +34981,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "lama"
@@ -34788,5 +34993,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "praia"
@@ -34864,8 +35069,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "rota"
@@ -34954,12 +35159,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "limite"
@@ -35109,11 +35314,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "lugar"
@@ -35127,5 +35332,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -35493,4 +35698,42 @@
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Somente o máximo de duas áreas podem ser unidas no momento."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Fundir área sobreposta consigo mesma"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Entrada de valores para todos conflitos"
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Resolver conflitos"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Juntas Áreas: Remover Caminhos Curtos"
+
+#~ msgid "Closed Way"
+#~ msgstr "Vía Fechada"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr "Erro: Linha ''{0}'' inesperada na lista de bookmarks do servidor"
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr ""
+#~ "Erro: Valor real ilegal \"{0}\" na linha \"{1}\" na lista de favoritos do "
+#~ "servidor"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Falha ao carregar favoritos de \"{0}\" por razões de segurança. Exceção: "
+#~ "{1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>Não foi possível gravar favorito.<br>{0}</html>"
 
 #~ msgid "Uploading..."
@@ -36049,7 +36292,4 @@
 #~ msgstr "Contato {0}..."
 
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Número de parametros incorreto para operador de nós."
-
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Valor incorreto do operador de id: {0}. Se esperava um número."
@@ -36073,7 +36313,4 @@
 #~ msgid "removing reference from way {0}"
 #~ msgstr "removendo referência de caminho {0}"
-
-#~ msgid "Split way segment"
-#~ msgstr "Dividir segmento de via"
 
 #~ msgid "nodes"
Index: /applications/editors/josm/i18n/po/ro.po
===================================================================
--- /applications/editors/josm/i18n/po/ro.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/ro.po	(revision 23252)
@@ -8,7 +8,7 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
-"PO-Revision-Date: 2010-09-06 16:24+0000\n"
-"Last-Translator: Alexandru Tataru <Unknown>\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
+"PO-Revision-Date: 2010-09-12 13:39+0000\n"
+"Last-Translator: bastik <Unknown>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:51+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -232,5 +232,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -252,5 +251,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -272,7 +271,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -395,5 +395,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -420,4 +420,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -425,5 +426,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -458,5 +459,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Informaţii"
@@ -668,8 +669,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -681,5 +682,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Şterge"
@@ -857,14 +858,14 @@
 msgstr "Părăsiţi aplicaţia."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr ""
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr ""
@@ -907,26 +908,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -937,5 +934,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -943,37 +940,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+msgid "Reverting changes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+msgid "Removed duplicate nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -981,33 +1006,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Introdu valori pentru toate conflictele."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Rezolvă Conflictele"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+msgid "Split ways into fragments"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr ""
@@ -1508,12 +1521,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1534,6 +1546,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1568,6 +1580,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Eroare"
@@ -1599,5 +1611,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1708,5 +1720,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr ""
@@ -1732,5 +1744,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr ""
@@ -1762,5 +1774,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1940,10 +1952,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2338,4 +2350,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2480,17 +2493,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2500,18 +2513,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2964,4 +2977,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3344,5 +3358,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Valoare nouă"
@@ -3415,15 +3428,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3432,5 +3445,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3439,5 +3452,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3446,5 +3459,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3453,5 +3466,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3459,5 +3472,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3466,5 +3479,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3473,5 +3486,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3480,5 +3493,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3487,15 +3500,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
@@ -3510,23 +3512,4 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
 msgstr ""
 
@@ -3937,12 +3920,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, 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:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
 msgstr ""
 
@@ -4062,5 +4059,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr ""
@@ -4230,10 +4227,10 @@
 msgstr "Dacă este specificat, resetează configuraţia în loc de a o citi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Nume utilizator"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4404,8 +4401,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4623,5 +4620,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5152,9 +5149,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5167,9 +5164,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5255,5 +5251,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "nici unul"
@@ -5541,5 +5537,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5641,11 +5637,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Adaugă"
@@ -5990,10 +5986,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr ""
@@ -7642,9 +7638,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7653,13 +7649,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7667,10 +7663,10 @@
 msgstr "<diferit>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Schimb valorile?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7679,5 +7675,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7686,78 +7682,86 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Vă rog selectaţi o cheie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Vă rog selectaţi o valoare"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 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/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr ""
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Şterge cheia selectată din toate obiectele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Adaugă o nouă pereche cheie/valoare tuturor obiectelor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editează valoarea cheii selectata pentru toate obiectele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+msgid "Launch browser with wiki help to selected object"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr ""
@@ -8483,5 +8487,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9069,5 +9073,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11210,13 +11214,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11224,18 +11228,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Vă rog selectaţi rândul care va fi şters."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11243,20 +11258,13 @@
 msgstr "Vă rog selectaţi rândul care va fi editat."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Vă rog selectaţi rândul care va fi şters."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
+msgstr "Schimb valorile?"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Valoare"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -11807,5 +11815,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr ""
@@ -12275,5 +12283,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12283,10 +12296,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12296,5 +12309,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12303,5 +12316,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12310,5 +12323,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12317,9 +12330,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr ""
@@ -14179,5 +14192,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr ""
@@ -14194,5 +14207,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr ""
@@ -14561,5 +14579,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -14648,4 +14666,28 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Modificare proprietăţi"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Importă imagini"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Importă imagini"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Eroare la prelucrare"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15004,4 +15046,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15022,5 +15065,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15028,5 +15071,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -15511,8 +15554,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr ""
@@ -15573,6 +15616,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr ""
@@ -16035,6 +16078,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr ""
@@ -16252,6 +16295,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+msgid "External tool error"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16274,5 +16324,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -16977,5 +17027,5 @@
 msgstr ""
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr ""
@@ -17744,4 +17794,9 @@
 msgstr ""
 
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr ""
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
@@ -19675,5 +19730,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr ""
@@ -19809,140 +19864,139 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+msgid "Play/Pause"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+msgid "Backward"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+msgid "Jump To"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+msgid "Forward"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+msgid "Faster"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+msgid "Slower"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -19959,4 +20013,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20053,6 +20111,11 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+msgid "Enter search expression here.."
+msgstr ""
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20080,5 +20143,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr ""
@@ -20089,5 +20152,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
+msgid "Get Capabilities"
 msgstr ""
 
@@ -20119,5 +20182,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr ""
@@ -20249,24 +20312,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20277,80 +20340,80 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Salvează strat WMS în fișier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Salvează strat WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20359,5 +20422,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20367,73 +20430,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Apropie"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Elimină"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20496,5 +20570,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr ""
@@ -20788,6 +20862,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -20797,15 +20877,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr ""
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -20817,10 +20897,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -20828,10 +20908,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -20840,15 +20920,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -20857,20 +20937,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -20880,15 +20960,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -20896,5 +20976,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -20904,15 +20984,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -20921,5 +21001,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -20929,20 +21009,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20950,5 +21030,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20956,5 +21036,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20963,5 +21043,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -20970,10 +21050,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -20981,15 +21061,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -20999,5 +21079,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21006,10 +21086,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21018,5 +21098,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21024,16 +21104,30 @@
 msgstr ""
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+msgid "Plugin for Seamap Editor"
+msgstr ""
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21043,15 +21137,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21060,5 +21154,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21067,5 +21161,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21074,10 +21168,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21086,5 +21180,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21094,5 +21188,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21101,20 +21195,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21123,5 +21217,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22016,4 +22110,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22021,5 +22159,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr ""
@@ -22526,5 +22664,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr ""
@@ -22573,5 +22711,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr ""
@@ -22604,6 +22742,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr ""
@@ -23762,5 +23900,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr ""
@@ -23958,7 +24096,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr ""
@@ -24234,8 +24372,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr ""
@@ -25671,5 +25809,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr ""
@@ -26942,32 +27080,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr ""
@@ -28764,9 +28936,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr ""
@@ -30429,5 +30601,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr ""
@@ -30708,5 +30880,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -30724,5 +30896,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr ""
@@ -31099,7 +31271,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr ""
@@ -31191,9 +31363,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr ""
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31203,5 +31383,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr ""
@@ -31220,7 +31400,19 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+msgid "highway_platform"
+msgstr ""
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr ""
@@ -31235,5 +31427,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr ""
@@ -31247,5 +31439,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr ""
@@ -31259,5 +31451,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr ""
@@ -31271,5 +31463,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr ""
@@ -31473,14 +31665,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr ""
@@ -31494,5 +31686,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -31554,7 +31746,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr ""
@@ -31577,10 +31769,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr ""
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr ""
@@ -31614,7 +31806,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr ""
@@ -31659,6 +31851,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr ""
@@ -31680,5 +31872,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr ""
@@ -31692,5 +31884,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr ""
@@ -31768,8 +31960,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr ""
@@ -31785,5 +31977,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr ""
@@ -31797,5 +31989,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr ""
@@ -31809,5 +32001,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr ""
@@ -31821,5 +32013,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr ""
@@ -31833,5 +32025,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr ""
@@ -31845,5 +32037,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr ""
@@ -31963,11 +32155,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr ""
@@ -31980,5 +32172,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr ""
@@ -31992,5 +32184,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr ""
@@ -32134,13 +32326,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr ""
@@ -32154,5 +32346,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr ""
@@ -32248,10 +32440,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr ""
@@ -32361,11 +32553,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr ""
@@ -32803,24 +32995,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr ""
@@ -32852,6 +33044,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr ""
@@ -32912,8 +33104,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr ""
@@ -33274,26 +33466,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr ""
@@ -33365,8 +33557,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr ""
@@ -33466,9 +33658,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr ""
@@ -33556,9 +33748,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr ""
@@ -33571,5 +33763,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr ""
@@ -33583,5 +33775,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr ""
@@ -33603,5 +33795,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr ""
@@ -33615,5 +33807,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr ""
@@ -33636,5 +33828,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr ""
@@ -33648,5 +33840,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr ""
@@ -33660,5 +33852,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr ""
@@ -33672,5 +33864,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr ""
@@ -33684,5 +33876,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr ""
@@ -33739,7 +33931,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr ""
@@ -33753,5 +33945,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr ""
@@ -33764,5 +33956,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr ""
@@ -33777,5 +33969,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr ""
@@ -33789,5 +33981,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr ""
@@ -33841,8 +34033,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr ""
@@ -33856,5 +34048,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr ""
@@ -33868,5 +34060,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr ""
@@ -33880,5 +34072,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr ""
@@ -33892,5 +34084,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr ""
@@ -33904,5 +34096,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr ""
@@ -33980,8 +34172,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr ""
@@ -34070,12 +34262,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr ""
@@ -34225,11 +34417,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr ""
@@ -34243,5 +34435,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -34610,4 +34802,10 @@
 msgstr ""
 
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Introdu valori pentru toate conflictele."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Rezolvă Conflictele"
+
 #~ msgid "Incorrect password or username."
 #~ msgstr "Parolă sau nume utilizator incorecte."
@@ -34664,7 +34862,4 @@
 #~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 #~ msgstr "Introduceţi data afişată (ll/zz/aaaa HH:MM:SS)"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Eroare la prelucrare"
 
 #~ msgid ""
Index: /applications/editors/josm/i18n/po/ru.po
===================================================================
--- /applications/editors/josm/i18n/po/ru.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/ru.po	(revision 23252)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
-"PO-Revision-Date: 2010-09-06 10:26+0000\n"
-"Last-Translator: J-Wills <Unknown>\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
+"PO-Revision-Date: 2010-09-18 10:29+0000\n"
+"Last-Translator: Dmitry Terentiev <Unknown>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -85,6 +85,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -238,5 +238,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -258,5 +257,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -278,7 +277,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -403,5 +403,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -428,4 +428,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -433,5 +434,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -466,5 +467,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Информация"
@@ -678,8 +679,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -691,5 +692,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Удалить"
@@ -865,14 +866,14 @@
 msgstr "Выйти из программы"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Полноэкранный режим"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Переключить полноэкранный режим"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Переключить полноэкранный режим"
@@ -915,13 +916,13 @@
 msgstr "Показать информацию об элементах OSM: линиях, точках или отношениях."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Объединить накладывающиеся полигоны"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Объединить полигоны, накладывающиеся друг на друга"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
@@ -929,14 +930,10 @@
 "присоединить."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Только два полигона могут быть объединены в данный момент."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" не замкнут, и поэтому они не могут быть объединены."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -948,5 +945,5 @@
 msgstr[2] "Выбранные линии содержат точки за пределами области скачивания."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -954,37 +951,67 @@
 msgstr "Это может привести к случайному удалению точек."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Вы действительно хотите продолжить?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Пожалуйста, остановитесь, если вы не уверены"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Пересечений не найдено. Изменений сделано не было."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Откатить пакет правок"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Удаление повторяющихся точек..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Добавлены точки на всех пересечениях"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Удалить линии, которые не являются внутренней частью мультиполигона"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Исправить отношения"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Присоединённая самоперекрывающаяся область"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Объединённые наложенные полигоны"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -994,33 +1021,22 @@
 "Пожалуйста, проверьте не появились ли ошибки."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Введите значения для всех конфликтов."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Уладить конфликты"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Уладить конфликты тегов"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Разделить сегмент линии"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Удалённый из отношений элемент"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Объединить полигоны: короткие линии удаляются"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Замкнутая линия"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Удалить теги у внутренних линий"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Функция объединения полигонов"
@@ -1561,12 +1577,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1587,6 +1602,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1621,6 +1636,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Ошибка"
@@ -1628,5 +1643,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:54
 msgid "Reverse way"
-msgstr ""
+msgstr "Развернуть линию"
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:67
@@ -1652,5 +1667,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1765,5 +1780,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Закрыть"
@@ -1789,5 +1804,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Нет, прервать"
@@ -1819,5 +1834,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -2021,10 +2036,10 @@
 msgstr "Неприкрепленная точка"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Дублировать в {0} точек"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2445,4 +2460,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2599,17 +2615,17 @@
 msgstr[2] "Добавьте или переместите новую виртуальную точку на {0} линий"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Переместить элементы"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Переместить"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Отмена перемещения"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2622,9 +2638,9 @@
 "часто производится по ошибке. Действительно переместить их?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2633,9 +2649,9 @@
 "объединения с ближайшей точкой."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Отпустите кнопку мыши, чтобы прекратить вращение."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3140,4 +3156,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3543,5 +3560,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Новое значение"
@@ -3614,15 +3630,15 @@
 msgstr "Неправильное значение долготы ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Предупреждение: не удается сохранить настройки в ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Ошибка в файле конфигурации на строках {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3633,5 +3649,5 @@
 "не является каталогом."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3642,5 +3658,5 @@
 "является каталогом.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3651,5 +3667,5 @@
 "отсутствующий каталог настроек: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3660,5 +3676,5 @@
 "каталог настроек: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3668,5 +3684,5 @@
 "параметрами по умолчанию."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3677,5 +3693,5 @@
 "параметров по умолчанию."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3686,5 +3702,5 @@
 "к состоянию по умолчанию: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3695,5 +3711,5 @@
 "резервный<br>{0}<br> а новый будет создан с параметрами по умолчанию.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3703,17 +3719,4 @@
 "Предупреждение: Ошибка инициализации настроек. Не удалось сбросить файл "
 "настроек {0} к состоянию по умолчанию."
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Ошибка: Неожиданная строка ''{0}'' в файле закладок ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Ошибка: Неверное двойное значение ''{0}'' в строке ''{1}'' в файле закладок "
-"''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3730,27 +3733,4 @@
 msgid "Could not load preferences from server."
 msgstr "Невозможно скачать настройки с сервера."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr "Ошибка: Неожиданная строка ''{0}'' в списке закладок с сервера"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-"Ошибка: Неверное двойное значение ''{0}'' в строке ''{1}'' в списке закладок "
-"с сервера"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"Не удалось загрузить закладки с ''{0}'' в свези с проблемами безопасности. "
-"Текст ошибки: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4139,5 +4119,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
 msgid "South"
-msgstr ""
+msgstr "Юг"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
@@ -4147,5 +4127,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
 msgid "Offset 3.000.000m east"
-msgstr ""
+msgstr "Смещение 3.000.000 м на восток"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
@@ -4177,14 +4157,32 @@
 msgstr "Система координат UTM"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "Неверное число параметров для оператора точек."
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Ошибка создания директории кэша: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Ошибка: Неожиданная строка ''{0}'' в файле закладок ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Ошибка: Неверное двойное значение ''{0}'' в строке ''{1}'' в файле закладок "
+"''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 "<html>Невозможно прочесть закладки с <br>''{0}''<br>Текст ошибки: {1}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>Невозможно записать закладку.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4304,5 +4302,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "здание"
@@ -4479,10 +4477,10 @@
 msgstr "Если выбрано - установить настройки по умолчанию."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4630,8 +4628,10 @@
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] "JOSM нашел {0} не сохраненных слоев данных osm "
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
 msgstr ""
+"Возможно в прошлый раз произошел сбой. Вы желаете восстановить эти данные?"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
@@ -4667,8 +4667,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4895,5 +4895,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5467,9 +5467,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5482,9 +5482,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5572,5 +5571,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "ничего"
@@ -5883,5 +5882,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5986,11 +5985,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Добавить"
@@ -6336,10 +6335,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "Выбрать в списке отношений"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "Выбрать отношение в списке отношений."
@@ -8053,9 +8052,9 @@
 msgstr "Неправильная URL запроса пакета правок"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Добавить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -8065,13 +8064,13 @@
 msgstr[2] "Это изменит {0} объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "Пустое значение удаляет тег"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -8079,10 +8078,10 @@
 msgstr "<различные>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Изменить значения?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -8092,5 +8091,5 @@
 msgstr[2] "Изменить параметры {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -8100,77 +8099,86 @@
 msgstr[2] "Это изменит до {0} объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Пожалуйста, выберите ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Выберите значение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 msgid "Please select the objects you want to change properties for."
 msgstr "Выберите объекты, для которых вы желаете изменить параметры."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Параметры/Участники"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Параметры выделенных объектов."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Участник"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr "Расположение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Свойств: {0} / Участников: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Параметры / Участники"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Изменить отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Удалить из отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Удалить выделенный ключ из всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Удалить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавить новую пару ключ/значение для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Изменить значение выбранного ключа для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Параметры выделенных объектов."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "Выбрать отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "Выберите отношение в основном выборе."
@@ -8962,5 +8970,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9621,5 +9629,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -12040,13 +12048,13 @@
 msgstr "Получение информации о пользователе..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Расширенные настройки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Установка параметров напрямую. Пользоваться с осторожностью!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -12054,18 +12062,29 @@
 msgstr "Поиск: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Текущее значение - по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Значение по умолчанию - ’’{0}’’."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr "Значение по умолчанию неизвестно (настройка ещё не использовалась)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Пожалуйста, выберите ряд для удаления."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Введите новый ключ и значение"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -12073,20 +12092,13 @@
 msgstr "Пожалуйста, выберите ряд для редактирования."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Новое значение для {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Пожалуйста, выберите ряд для удаления."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Введите новый ключ и значение"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Значение"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12223,5 +12235,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
 msgid "Auto saved files per layer"
-msgstr ""
+msgstr "Резервных копий для каждого слоя"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
@@ -12231,8 +12243,11 @@
 "tries to recover the unsaved changes on next start.)</i>"
 msgstr ""
+"<i>(Авто-сохранение периодически копирует измененные данные для каждого "
+"слоя. Резервные копии сохраняются в  директории JOSM. В случае сбоя, JOSM "
+"пытается восстановить не сохраненные изменения при следующем запуске.)</i>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
 msgid "Keep backup files when saving data layers"
-msgstr ""
+msgstr "Не удалять файлы резервных копий при сохранении слоев данных"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
@@ -12247,4 +12262,7 @@
 "the file name and saves it in the same folder.)</i>"
 msgstr ""
+"<i>(JOSM может не удалять файлы резервных копий при сохранении слоев данных. "
+"При этом к имени файла добавляется суффикс ''~'' и он сохраняется в той же "
+"директории.)</i>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
@@ -12668,5 +12686,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Использовать настройки по умолчанию"
@@ -13159,5 +13177,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
 msgid "Internal style"
-msgstr ""
+msgstr "Внутренний стиль"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
@@ -13173,5 +13191,10 @@
 "''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Не удалось прочитать источник заготовок тегов: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -13183,10 +13206,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr "Не удаётся прочитать источник заготовок тегов {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -13199,5 +13222,5 @@
 "width=600>Сообщение об ошибке: [{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -13209,5 +13232,5 @@
 "{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -13219,5 +13242,5 @@
 "ошибке: {1}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -13229,9 +13252,9 @@
 "table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Сортировать меню заготовок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Заготовки с тегами"
@@ -13700,5 +13723,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:954
 msgid "Add relation"
-msgstr ""
+msgstr "Добавить отношение"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:975
@@ -13726,5 +13749,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 msgid "New relation"
-msgstr ""
+msgstr "Новое отношение"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1078
@@ -14866,5 +14889,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:114
 msgid "Reading error text failed."
-msgstr ""
+msgstr "Не удалось прочитать текст ошибки."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
@@ -15281,5 +15304,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "описание отсутствует"
@@ -15298,5 +15321,10 @@
 msgstr "Файл модуля ''{0}'' Не содержит соглашения."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "Дополнительная информация..."
@@ -15749,5 +15777,5 @@
 "JOSM ''{0}''. Используется код по умолчанию ''en''."
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -15857,4 +15885,28 @@
 "окна с помощью параметров.."
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Изменить параметры"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Импорт изображений"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Захватить непривязанное к координатам изображение"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Ошибка! Во время создания резервной копии был удалён слой: {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -16018,4 +16070,5 @@
 msgid "You have {0} Elements selected. But you can edit only one element!"
 msgstr ""
+"Выделено {0} элемента(ов). Но вы можете редактировать только один элемент!"
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
@@ -16030,18 +16083,18 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
 msgid "There is something wrong in the value near:"
-msgstr ""
+msgstr "Что-то не правильно в значении около:"
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
 #, java-format
 msgid "Info: {0}"
-msgstr ""
+msgstr "Информация: {0}"
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
 msgid "Correct the value manually and than press Enter."
-msgstr ""
+msgstr "Исправьте значение в ручную и нажмите ввод."
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
 msgid "Error in timeformat"
-msgstr ""
+msgstr "Ошибка в формате времени"
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
@@ -16227,4 +16280,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr "Выровнять линии"
@@ -16239,11 +16293,11 @@
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:90
 msgid "AlignWayS: Alignment not possible"
-msgstr ""
+msgstr "AlignWayS: Выравнивание не возможно"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:89
 msgid "Aligning would result nodes outside the world.\n"
-msgstr ""
-
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+msgstr "В результате разворота будут точки за пределами Земли.\n"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr "Я готов!"
@@ -16251,5 +16305,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr "Советы для AlignWays"
@@ -16439,4 +16493,9 @@
 "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
 msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Выравнивание сегментов.</b> Нажите <b><i><span style=\"color:green"
+"\">"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:103
@@ -16502,5 +16561,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:33
 msgid "Buildings tags:"
-msgstr ""
+msgstr "Теги зданий:"
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:234
@@ -16823,8 +16882,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "вода"
@@ -16885,6 +16944,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "адрес"
@@ -17383,6 +17442,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Пустой слой"
@@ -17606,6 +17665,15 @@
 msgstr "Не найдено слоя данных GPX"
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Внешние инструменты"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+#, fuzzy
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr "В дочерний скрипт попали неверные данные."
 
@@ -17628,5 +17696,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr "Использовать внешние сценарии в JOSM"
@@ -17881,13 +17949,17 @@
 "with [irs rectify] in subject."
 msgstr ""
+"Эта функция создает сдвиг слоя IRS и короткую линию-вектор. Сначала вам "
+"необходимо сместить WMS слой для выравнивания.\n"
+"Полученный слой необходимо сохранить с расширением  *.osm и выслать Котяре  "
+"(me@komzpa.net) с темой [irs rectify]."
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:70
 msgid "Zoom level was not enough to record an offset precisely"
-msgstr ""
+msgstr "Масштаб слишком мелкий для сохранения точного смещения"
 
 #. if there are none, create one
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:103
 msgid "IRS Adjustment Layer"
-msgstr ""
+msgstr "Слой сдвига IRS"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
@@ -18353,5 +18425,5 @@
 msgstr "Вы должны выделить, как минимум, две линии."
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "ОткрытыеСлои"
@@ -18935,4 +19007,7 @@
 "web sites to detect a running JOSM."
 msgstr ""
+"Модуль Дистанционного управления запросил предоставить возможность "
+"отправлять версию протокола. Это позволит веб-сайтам определять какую версию "
+"JOSM вы используете."
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
@@ -19143,4 +19218,9 @@
 msgid "Enter weight values"
 msgstr "Введите значения веса"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Новое значение для {0}"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
@@ -21205,5 +21285,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "полигон"
@@ -21342,140 +21422,146 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "{0} {1}% трека GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr "Показывает текущее положение для видеофрагмента"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr "Импортировать видео"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr "Синхронизировать видео с этим треком GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr "Удалить видео"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr "удаляет текущее видео из слоя"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr "воспр/пауза"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Воспроизведение/Пауза"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr "начинает/приостанавливает воспроизведение видео"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
 msgstr "назад"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr "отмотать n сек назад"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr "Перейти"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Перемотать вперёд"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr "перейти на указанное время gps трека"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr "введите временную отсечку gps-трека"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr "вперёд"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Вперёд"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr "промотать n сек вперёд"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr "быстрее"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Быстрее"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr "воспроизводить быстрее"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr "медленнее"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Медленнее"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr "воспроизводить медленнее"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+#, fuzzy
+msgid "Loop"
 msgstr "циклически"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr "зацикливать n сек возле текущей позиции"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr "Удерживать в центре"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr "устанавливать пиктограмму видео автоматически"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr "Подзаголовок"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr "Показать субтитры на видео"
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr "Длительность промотки"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 msgid "Set the length of a jump"
 msgstr "Задать продолжительность промотки"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr "Промотать видео на x мсек"
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr "Длина цикла"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr "Задать продолжительность цикла"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr "без деинтерлейзинга"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr "дейнтерлейзить используя дублирование строк"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr "деинтерлейзить используя линейную интерполяцию"
@@ -21493,4 +21579,8 @@
 msgid "play"
 msgstr "воспр"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
+msgstr "циклически"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
@@ -21599,8 +21689,14 @@
 msgstr "Точка ''{0}'' это соединение более, чем 2 пересекающихся линий."
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Введите выражение для поиска"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
-msgstr ""
+msgstr "Выбрать путевую точку для смещения карты"
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -21610,5 +21706,5 @@
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
 msgid "Search after waypoint. Click and move the map view to the waypoint."
-msgstr ""
+msgstr "Поиск путевой точки. Перемещает карту на путевую точку и выделяет ее."
 
 #: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:44
@@ -21623,8 +21719,8 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:77
 msgid "Unnamed WMS Layer"
-msgstr ""
+msgstr "Безымянный слой WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Название меню"
@@ -21632,9 +21728,10 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:83
 msgid "Service URL"
-msgstr ""
+msgstr "Служебная ссылка"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Спортивные сооружения"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21643,4 +21740,6 @@
 "so you can not use it. This message will not show again."
 msgstr ""
+"Этот слой не поддерживает ни одну проекцию JOSM,\n"
+"и вы не можете его использовать. Это сообщение снова не появится."
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
@@ -21658,12 +21757,12 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:158
 msgid "Show Bounds"
-msgstr ""
+msgstr "Показать границы"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160
 msgid "No bounding box was found for this layer."
-msgstr ""
+msgstr "Не найдены границы для этого слоя."
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "Ссылка на WMS"
@@ -21671,9 +21770,9 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
 msgid "Invalid service URL."
-msgstr ""
+msgstr "Неверная служебная ссылка"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:255
 msgid "Could not retrieve WMS layer list."
-msgstr ""
+msgstr "Невозможно загрузить список слоев WMS."
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
@@ -21682,5 +21781,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:296
 msgid "Could not parse WMS layer list."
-msgstr ""
+msgstr "Невозможно разобрать список слоев WMS."
 
 #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
@@ -21805,5 +21904,5 @@
 "Это может привести к ошибочным координатам."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21812,19 +21911,19 @@
 "искажена"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr "(деактивировано)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -21839,17 +21938,17 @@
 "попытаться извлечь квадраты WMS?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "Да, выбрать изображения"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "Ошибочная ссылка?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Скачать видимые квадраты карты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21858,33 +21957,33 @@
 "измените разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Изменить разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Загрузить заново ошибочные квадраты карты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Альфа канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Сохранить слой WMS в файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Сохранить WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Загрузить слой WMS из файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "Загрузить WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -21892,30 +21991,30 @@
 "Неподдерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Ошибка формата файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Ошибка при загрузке файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "Установить закладку WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Автоматическое скачивание"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -21924,5 +22023,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -21932,73 +22031,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Открыть пустой WMS-слой для загрузки данных из файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Настройки модуля WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Измениить список серверов WMS, отображаемых в меню модуля WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "Скопировать выделенное по умолчанию"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "Пожалуйста, выберите, хотя бы одну строчку для копирования."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "Средство скачивания:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "Перекрытие квадратов карты"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "% восточнее:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "% севернее:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr "Одновременно соединений"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Масштаб"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Имя пункта меню (по умолчанию)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "WMS URL (по умолчанию)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "Скопировать выделенное по умолчанию"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "Пожалуйста, выберите, хотя бы одну строчку для копирования."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "Средство скачивания:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "Перекрытие квадратов карты"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "% восточнее:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "% севернее:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr "Одновременно соединений"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Удалить"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -22067,5 +22177,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "лесопосадки"
@@ -22359,6 +22469,12 @@
 msgstr "Насыщенность:"
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -22370,15 +22486,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr "Инструменты для прорисовки зданий."
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr "Особый обработчик на WMS-сервере французского земельного кадастра."
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -22395,10 +22511,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "Создаёт сетку из линий."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -22407,5 +22523,5 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
@@ -22413,5 +22529,5 @@
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -22422,15 +22538,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr "Загрузка данных OSM вдоль линии"
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "Дублирует линии с помощью смещения"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -22441,5 +22557,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
@@ -22447,15 +22563,15 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr "Показывает информацию о маршруте в виде диаграмы."
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "Предоставить фоновый слой который отображает сетку на карте"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -22468,15 +22584,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "Помогает векторизовать изображения WMS."
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -22485,5 +22601,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -22496,15 +22612,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "Добавляет запрет поворота налево для наборов из 4 или 5 линий"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr "Просто преобразовать область в мультиполигон."
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -22515,5 +22631,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -22526,20 +22642,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "Отображает фоновый рисунок OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Импорт вопросов из OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -22549,5 +22665,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -22557,5 +22673,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -22566,5 +22682,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -22575,10 +22691,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Великолепный JGoodies Пластиковый Скин."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -22588,15 +22704,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Разрешить другим приложениям посылать команды в JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr "Модуль для отката пакетов правок"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -22609,5 +22725,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -22618,10 +22734,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Предоставляет возможности маршрутизации."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -22633,5 +22749,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -22641,16 +22757,33 @@
 "\"быстрой карты\" в качестве фона и запросить обновления."
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+#, fuzzy
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+"Создание и редактирование навигационных знаков (seamarks) для OpenSeaMap"
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "Информация о модуле"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Позволяет добавлять метки/точки в текущей GPS позиции."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Показывает окно для редактирования тегов в табличной сетке."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22663,10 +22796,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "Сделать ряд домов вдоль улицы из одного блока."
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
@@ -22674,5 +22807,5 @@
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22684,5 +22817,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22693,5 +22826,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22702,10 +22835,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr "Позволяет восстанавливать объекты, удаленные из базы данных OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22717,5 +22850,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22728,5 +22861,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22737,20 +22870,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Быстрое скачивание вдоль большого набора связанных линий"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
-msgstr ""
+msgstr "Поиск по путевым точкам, импортированным из файлов gpx."
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Выделить последовательность неветвящихся соединённых линий"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22762,5 +22895,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -23656,4 +23789,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -23661,5 +23838,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "Круг"
@@ -24166,5 +24343,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "дорога местного значения"
@@ -24213,5 +24390,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "служебный проезд"
@@ -24244,6 +24421,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "строящаяся дорога"
@@ -24496,5 +24673,5 @@
 #: build/trans_presets.java:628
 msgid "Amount of Steps"
-msgstr ""
+msgstr "Количество ступенек"
 
 #. item "Waypoints/Motorway Junction"
@@ -24596,10 +24773,10 @@
 #: build/trans_presets.java:652
 msgid "Rest Area"
-msgstr ""
+msgstr "Место для отдыха"
 
 #. item "Waypoints/Rest Area" label "Edit Rest Area"
 #: build/trans_presets.java:653
 msgid "Edit Rest Area"
-msgstr ""
+msgstr "Свойства Места для отдыха"
 
 #. unparsed line                 <check key="toilets" default="off" delete_if_empty="true" />
@@ -24916,5 +25093,5 @@
 #: build/trans_presets.java:3554
 msgid "Wikipedia"
-msgstr ""
+msgstr "Википедия"
 
 #. </optional>
@@ -25402,5 +25579,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "открытое болото"
@@ -25598,7 +25775,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "велосипедный"
@@ -25874,8 +26051,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "рельс"
@@ -26655,5 +26832,5 @@
 #: build/trans_presets.java:1434 build/trans_presets.java:1483
 msgid "Contact:"
-msgstr ""
+msgstr "Контакты:"
 
 #. item "Car/Tyres" text "Phone Number"
@@ -27311,5 +27488,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "пассажирский терминал"
@@ -28582,32 +28759,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "спорт"
@@ -30404,9 +30615,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "зелёный"
@@ -32069,5 +32280,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "линия метро"
@@ -32348,5 +32559,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32364,5 +32575,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "устаревший"
@@ -32739,7 +32950,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "трек автодороги"
@@ -32831,9 +33042,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "услуги"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32843,5 +33062,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "брод"
@@ -32860,7 +33079,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "трек автодороги"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "круг для разворота"
@@ -32875,5 +33107,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr "пункт_неотложной_помощи"
@@ -32887,5 +33119,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "берег реки"
@@ -32899,5 +33131,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "поток"
@@ -32911,5 +33143,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "док"
@@ -33113,14 +33345,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "искусственный"
@@ -33134,5 +33366,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr "Водные пороги"
@@ -33194,7 +33426,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "ж/д путевая точка"
@@ -33217,10 +33449,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "другая жд дорога"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "жд дорога сверху"
@@ -33254,7 +33486,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "Старая жд дорога"
@@ -33299,6 +33531,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "воздушная трасса"
@@ -33320,5 +33552,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "тёмная воздушная трасса"
@@ -33332,5 +33564,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "светлая воздушная трасса"
@@ -33408,8 +33640,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "канатная дорога"
@@ -33425,5 +33657,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "простая_лыжня"
@@ -33437,5 +33669,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "нормальная_лыжня"
@@ -33449,5 +33681,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "усложнённая_лыжня"
@@ -33461,5 +33693,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr "очень_сложная_лыжня"
@@ -33473,5 +33705,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "лыжня_произвольного_стиля"
@@ -33485,5 +33717,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "новичковая_лыжня"
@@ -33603,11 +33835,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "энергия"
@@ -33620,5 +33852,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "пирс"
@@ -33632,5 +33864,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "трубопровод"
@@ -33774,13 +34006,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "развлечения"
@@ -33794,5 +34026,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "гавань"
@@ -33888,10 +34120,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "инфраструктура"
@@ -34001,11 +34233,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "режим_работы"
@@ -34443,24 +34675,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "инфраструктура_светлый"
@@ -34492,6 +34724,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "светлая_вода"
@@ -34552,8 +34784,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "здоровье"
@@ -34914,26 +35146,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "магазин"
@@ -35005,8 +35237,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "отель"
@@ -35106,9 +35338,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "туристический"
@@ -35196,9 +35428,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "исторический"
@@ -35211,5 +35443,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "карьер"
@@ -35223,5 +35455,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "мусорная свалка"
@@ -35243,5 +35475,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "водоём"
@@ -35255,5 +35487,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "двор фермы"
@@ -35276,5 +35508,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "розничная продажа"
@@ -35288,5 +35520,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "промышленный"
@@ -35300,5 +35532,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "заброшенная застройка"
@@ -35312,5 +35544,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "участок для застройки"
@@ -35324,5 +35556,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "жд разъезд"
@@ -35379,7 +35611,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "военный"
@@ -35393,5 +35625,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "кладбище"
@@ -35404,5 +35636,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "пик"
@@ -35417,5 +35649,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "ледник"
@@ -35429,5 +35661,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "вулкан"
@@ -35481,8 +35713,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "природный"
@@ -35496,5 +35728,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "кустарник"
@@ -35508,5 +35740,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "пустошь"
@@ -35520,5 +35752,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "лес"
@@ -35532,5 +35764,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "грязь"
@@ -35544,5 +35776,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "пляж"
@@ -35620,8 +35852,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "маршрут"
@@ -35710,12 +35942,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "граница"
@@ -35865,11 +36097,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "место"
@@ -35883,5 +36115,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr "данные TIGER"
@@ -36251,4 +36483,60 @@
 msgstr "PCN 2006 — Италия"
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Только два полигона могут быть объединены в данный момент."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Присоединённая самоперекрывающаяся область"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Введите значения для всех конфликтов."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Уладить конфликты"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Объединить полигоны: короткие линии удаляются"
+
+#~ msgid "Closed Way"
+#~ msgstr "Замкнутая линия"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr "Ошибка: Неожиданная строка ''{0}'' в списке закладок с сервера"
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr ""
+#~ "Ошибка: Неверное двойное значение ''{0}'' в строке ''{1}'' в списке "
+#~ "закладок с сервера"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Не удалось загрузить закладки с ''{0}'' в свези с проблемами "
+#~ "безопасности. Текст ошибки: {1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>Невозможно записать закладку.<br>{0}</html>"
+
+#~ msgid "play/pause"
+#~ msgstr "воспр/пауза"
+
+#~ msgid "jump"
+#~ msgstr "Перейти"
+
+#~ msgid "forward"
+#~ msgstr "вперёд"
+
+#~ msgid "faster"
+#~ msgstr "быстрее"
+
+#~ msgid "slower"
+#~ msgstr "медленнее"
+
+#~ msgid "Get Layers"
+#~ msgstr "Получить слои"
+
 #~ msgid "No data imported."
 #~ msgstr "Данные не импортированы"
@@ -36308,7 +36596,4 @@
 #~ msgid "Conflicting relation"
 #~ msgstr "Конфликтующее отношение"
-
-#~ msgid "Split way segment"
-#~ msgstr "Разделить сегмент линии"
 
 #~ msgid "Error while loading page {0}"
@@ -37273,7 +37558,4 @@
 #~ "html>"
 
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Неверное число параметров для оператора точек."
-
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Неверное значение id оператора: {0}. Ожидалось число."
Index: /applications/editors/josm/i18n/po/sk.po
===================================================================
--- /applications/editors/josm/i18n/po/sk.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/sk.po	(revision 23252)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
 "PO-Revision-Date: 2010-09-06 00:00+0000\n"
 "Last-Translator: Vlado <babicvm@szm.sk>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:55+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -235,5 +235,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -255,5 +254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -275,7 +274,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -398,5 +398,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -423,4 +423,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -428,5 +429,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -461,5 +462,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Informácia"
@@ -671,8 +672,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -684,5 +685,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Odstrániť"
@@ -858,14 +859,14 @@
 msgstr "Ukončť program."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Pohľad celá obrazovka"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Prepínač pohľadu na celej obrazovke"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Prepínač pohľadu na celej obrazovke"
@@ -908,26 +909,22 @@
 msgstr "Zobraziť informácie o objekte o OSM bodoch, cestách, alebo reláciách."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Spojiť prekrývajúce sa Plochy"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Spojiť plochy ktoré sa prekrývajú"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "Prosím, označte aspoň jednu uzavretú cestu, ktorá má byť spojená."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Teraz môžu byť spojené iba dve plochy(areas)."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" niesú uzavreté a preto nemôžu byť spojené.."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -939,5 +936,5 @@
 msgstr[2] "Vybraté trasy obsahujú body mimo stiahnutej oblasti údajov."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -945,37 +942,67 @@
 msgstr "To môže spôsobiť nechcené vymazanie uzlov."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Ste si naozaj istý, že chcete pokračovať?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Prosím prerušiť ak ste si nie istý"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Nenájdený žiadny priesečník. Nič nebolo zmenené."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Vrátiť zmeny vykonané v zmenovom súbore"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Odstraňujem duplicitné body..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Pridať body na všetky priesečníky"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Vymazať cesty, ktoré nie sú  vnútornou časťou multipolygónu"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Oprava relácie"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Spojená prekrývajúca sa plocha"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Spojené prekrývajúce sa plochy"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -985,33 +1012,22 @@
 "overte či to nepredstavuje nejakú chybu."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Zadajte hodnoty pre všetky konflikty"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Riešenie konfliktov"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Oprava konfliktu (rozporu) značiek"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Rozdeliť segment cesty"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Odstránený Prvok z Relácií"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Spojiť plochy: Vymazať krátke cesty"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Uzavretá cesta"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Vymazať značky z vnútorných ciest"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Funkcie Spojenia Plôch (Join Areas Function)"
@@ -1543,12 +1559,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1569,6 +1584,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1603,6 +1618,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Chyba"
@@ -1634,5 +1649,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1747,5 +1762,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Zavrieť"
@@ -1771,5 +1786,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Nie, zrušiť"
@@ -1801,5 +1816,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -2005,10 +2020,10 @@
 msgstr "Nepripojený bod (Unglued Node)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Duplikovať do {0} bodov"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2428,4 +2443,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2579,17 +2595,17 @@
 msgstr[2] "Pridať a posunúť virtuálny nový bod do {0} ciest"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Posunúť elementy"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Posunúť ich"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Krok späť posun"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2601,9 +2617,9 @@
 "Skutočne ich chcete presunúť?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Pustite tlačítko myši pre vybratie objektov v obdĺžniku."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2611,9 +2627,9 @@
 "Pustite tlačítko myši pre zastavenie pohybu. Ctrl spojí s najbližším bodom."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Pustite tlačítko myši k zastaveniu otáčania"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3108,4 +3124,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3510,5 +3527,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Nová hodnota"
@@ -3582,15 +3598,15 @@
 msgstr "Chybná hodnota zemepisnej dĺžky ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, 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:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, 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:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3601,5 +3617,5 @@
 "nie je adresár."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3610,5 +3626,5 @@
 "nie je adresár.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3619,5 +3635,5 @@
 "chýbajúceho adresára preferencií: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3628,5 +3644,5 @@
 "chýbajúceho adresára preferencií: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3636,5 +3652,5 @@
 "súboru preferencií."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3645,5 +3661,5 @@
 "súborom preferencií."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3654,5 +3670,5 @@
 "preferencií do východzieho: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3663,5 +3679,5 @@
 "súboru  <br>{0}<br> a vytváranie nového východzieho súboru.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3671,17 +3687,4 @@
 "Varovanie: Neúspešná inicializácia preferencií. Neúspešné resetovanie "
 "preferencií do východzích: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Chyba: Neočakávaný riadok ''{0}'' v súbore záložiek ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Chyba: Nedovolená zdvojená hodnota ''{0}'' v riadku ''{1}'' v súbore "
-"záložiek ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3698,27 +3701,4 @@
 msgid "Could not load preferences from server."
 msgstr "Nemôžem nahrať predvoľby zo servera."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr "Chyba: Neočakávaný riadok ''{0}'' v obsahu záložiek zo servera"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-"Chyba: Nedovolená zdvojená hodnota ''{0}'' v riadku ''{1}'' v obsahu "
-"záložiek zo servera"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"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:47
@@ -4144,13 +4124,31 @@
 msgstr "UTM Geodesic system"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "Zlé číslo parametrov pre operátor bodov."
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Chyba pri vytváraní cache adresára: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Chyba: Neočakávaný riadok ''{0}'' v súbore záložiek ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Chyba: Nedovolená zdvojená hodnota ''{0}'' v riadku ''{1}'' v súbore "
+"záložiek ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, 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:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>Nemôžem zapísať záložku.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4270,5 +4268,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "budova"
@@ -4447,10 +4445,10 @@
 "Ak je špecifikovaný(určený), reset konfigurácie namiesto jej načítania."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Meno používateľa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4632,8 +4630,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4860,5 +4858,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5429,9 +5427,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5444,9 +5442,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5532,5 +5529,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "žiadny"
@@ -5842,5 +5839,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5949,11 +5946,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Pridať"
@@ -6299,10 +6296,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "Vybrať v obsahu relácie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "Vybrať reláciu v obsahu relácií."
@@ -8016,9 +8013,9 @@
 msgstr "Táto požiadavka URL na zmenové súbory je chybná"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Pridať vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -8028,13 +8025,13 @@
 msgstr[2] "Toto chce zmeniť {0} objektov."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "Prázdna hodnota vymaže tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -8042,10 +8039,10 @@
 msgstr "<rôzne>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Zmeniť hodnoty ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -8055,5 +8052,5 @@
 msgstr[2] "Zmeniť vlastnosti až {0} objektov."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -8063,77 +8060,86 @@
 msgstr[2] "Toto zmení až {0} objekty."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Vyberte prosím kľúč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Vyberte prosím hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 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/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Vlastnosti/Členstvo(memberships)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Vlastnosti pre zvolené objekty"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Člen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr "Poloha"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Zmeniť reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Zmazať z relácie (zo vzťahu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Naozaj zmazať výber z relacie {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Zmaže zvolený klúč vo všetkých objektoch"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Zmazať vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Pridať nový kľúč/hodnota pár k všetkým objektom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Zmeniť hodnotu zvoleného klúča pre všetky objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Vlastnosti pre zvolené objekty"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "Vybrať reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "Vybrať reláciu v hlavnom výbere."
@@ -8907,5 +8913,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9553,5 +9559,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11944,13 +11950,13 @@
 msgstr "Získavam informácie o užívateľovi ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Pokročilé voľby"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Ručné nastavenie. Používajte opatrne!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11958,18 +11964,29 @@
 msgstr "Hľadať: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Súčasná hodnota je východzia"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Východzia hodnota je''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr "Východzia hodnota nie je známa (ešte nebola definovaná)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Prosím vyberte riadok na odstránenie."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Zadajte novú dvojicu klúč/hodnota"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11977,20 +11994,13 @@
 msgstr "Prosím vyberte riadok na úpravu."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Nová hodnota pre {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Prosím vyberte riadok na odstránenie."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Zadajte novú dvojicu klúč/hodnota"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Hodnota"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12570,5 +12580,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Povoliť vstavané východzie hodnoty"
@@ -13070,5 +13080,10 @@
 "Varovanie: neplatný formát počtu v štýle obsahu ''{0}''. Dostal som ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Nemôžem načítať zdroj predvolieb značenia: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -13078,10 +13093,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -13091,5 +13106,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -13098,5 +13113,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -13105,5 +13120,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -13112,9 +13127,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Menu Sort presets"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Predvoľby značenia (Tagging Presets)"
@@ -15147,5 +15162,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "Popis nedostupný"
@@ -15164,5 +15179,10 @@
 msgstr "Súbor pluginu ''{0}'' nezahŕňa Manifest."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "Viac informácií ..."
@@ -15619,5 +15639,5 @@
 "Použitý východzí kód ''en''."
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -15725,4 +15745,28 @@
 "nastavení."
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Zmeniť vlastnosti"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Importovať obrázky"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Zachytený obrázok bez zemepisných súradníc"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Chyba pri vytváraní zálohy z odstránenej vrstvy: {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -16088,4 +16132,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -16106,5 +16151,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr "Som pripravený!"
@@ -16112,5 +16157,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -16612,8 +16657,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "voda"
@@ -16674,6 +16719,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "adresa"
@@ -17174,6 +17219,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Prázdna vrstva"
@@ -17397,6 +17442,14 @@
 msgstr "GPS dátová vrstva nie je vytvorená."
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Interné štýly"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -17419,5 +17472,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -18138,5 +18191,5 @@
 msgstr "Musíte vybrať aspoň dve cesty."
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -18918,4 +18971,9 @@
 msgid "Enter weight values"
 msgstr "Vstup hmotnostnej hodnoty"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Nová hodnota pre {0}"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
@@ -20963,5 +21021,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "oblasť (plocha)"
@@ -21098,140 +21156,145 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Prehrať/Pauza"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Späť"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Skok vpred"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Vpred"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Rýchlejšie"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Pomalšie"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -21248,4 +21311,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -21355,6 +21422,12 @@
 msgstr "Bod ''{0}'' je spojený s viac ako 2 spojenými cestami."
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Vložiť hľadaný výraz"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -21382,5 +21455,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Meno v menu"
@@ -21391,6 +21464,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Športové zariadenie"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21421,5 +21495,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "WMS URL"
@@ -21558,5 +21632,5 @@
 "Môže to viesť k zlým súradniciam."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21564,19 +21638,19 @@
 "Varovanie: WMS vrstva je deaktivovaná, pretože je obsahuje chybnú url ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr "(deaktivované)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), sa automaticky sťahuje vo zväčšení (zoom) {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), sťahovaná vo zväčšení (zoom) {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -21591,17 +21665,17 @@
 "<br>Chcete doniesť WMS dlaždice aj napriek tomu?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "Áno, stiahni obrázky"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "Chybná URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Stiahnuť viditeľné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21609,63 +21683,63 @@
 "Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Zmena rozlíšenia"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Nahrať poškodené dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Uložiť WMS vrstvu do súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Uložiť WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Nahrať WMS vrstvu zo súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "Načítať WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Nepodporovaná verzia WMS súboru; nájdené {0}, očakávané {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Chyba formátu súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Chyba pri nahrávaní súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "Nastaviť WMS Záložku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Automatické sťahovanie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -21674,5 +21748,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -21682,73 +21756,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 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"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Nastavenie WMS Pluginu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Upraviť obsah WMS serverov zobrazených vo WMS menu pluginu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "Kopírovať vybrané vychodzie nastavenia"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "Prisím vyberte aspoň jeden riadok pre kopírovanie."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "Stahovač:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "Prekryť štvorce (tiles)"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "% z východu:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "% zo severu:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Zväčšenie"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Meno v menu (východzie)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "WMS URL (východzie)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "Kopírovať vybrané vychodzie nastavenia"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "Prisím vyberte aspoň jeden riadok pre kopírovanie."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "Stahovač:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "Prekryť štvorce (tiles)"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "% z východu:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "% zo severu:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Odstrániť"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -21816,5 +21901,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "les"
@@ -22108,6 +22193,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -22117,15 +22208,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr "Nástroje na kreslenie budov."
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr "Špeciálny manipulant pre francúzsky WMS server pozemkového registra."
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -22142,10 +22233,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "Vytvára cestnú sieť"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -22153,10 +22244,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Dovoľuje import rôzdnych formátov súborov priamo do JOSMu."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -22167,15 +22258,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "Duplikovať cesty s rozostupom/vzdialenosťou"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -22186,20 +22277,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Sťahuje GPS body z Globalsat DG100 datalogger-a  priamo do JOSM."
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr "Vizualizuje \"routing information\" ako routovací graf."
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "Určiť vrstvu pozadia pre zobrazenie mapovej súradnicovej siete"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -22212,15 +22303,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "Pomoc pri vektorizácii WMS obrázkov."
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -22230,5 +22321,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -22241,15 +22332,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "Pridanie zákazu zabočenia vľavo pre sadu zo 4 alebo 5 ciest"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr "Jednoduché prevedenie oblasti na multipolygón."
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -22260,5 +22351,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -22271,20 +22362,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "Zobrazenie OpenLayers obrázok pozadia"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importuje vydania z OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -22294,5 +22385,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -22301,5 +22392,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -22310,5 +22401,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -22319,10 +22410,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Ohromný JGoodies Plastic Look and Feel."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -22330,15 +22421,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Necháva ostatné aplikácie poslať príkaz do JOSMu."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -22348,5 +22439,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -22357,10 +22448,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Určuje trasové schopnosti"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -22369,5 +22460,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -22377,16 +22468,31 @@
 "pozadie a požiadať aktualizáciu."
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "Informácia o pluginoch"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Povoľuje pridávanie značiek/bodov na aktuálnu gps pozíciu."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Určuje dialóg pre editáciu značiek v tabuľkovej mriežke."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22399,15 +22505,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "Vytvára radové domy mimo jednotlivých blokov."
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22416,5 +22522,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22425,5 +22531,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22432,10 +22538,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22447,5 +22553,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22455,5 +22561,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22464,5 +22570,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -22470,15 +22576,15 @@
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Vyberte poradie nerozvetvených spojených ciest"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22489,5 +22595,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -23383,4 +23489,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -23388,5 +23538,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "kruhový objazd (roundabout)"
@@ -23893,5 +24043,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "obytná (osídlená)"
@@ -23940,5 +24090,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "obslužná (service)"
@@ -23971,6 +24121,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "konštrukcia"
@@ -25136,5 +25286,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "močiar (marsh)"
@@ -25332,7 +25482,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "bicykel"
@@ -25608,8 +25758,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "koľajnica (rail)"
@@ -27046,5 +27196,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "terminál"
@@ -28317,32 +28467,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "šport"
@@ -30143,9 +30327,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "zelená"
@@ -31809,5 +31993,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "metro (subway)"
@@ -32088,5 +32272,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32104,5 +32288,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "zastaralý"
@@ -32479,7 +32663,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "cesta (highway_track)"
@@ -32571,9 +32755,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "služby"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32583,5 +32775,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "brod"
@@ -32600,7 +32792,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "cesta (highway_track)"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "turningcircle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)"
@@ -32615,5 +32820,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr "miesto pohotovostnej prvej pomoci"
@@ -32627,5 +32832,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "riečny breh"
@@ -32639,5 +32844,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "potok"
@@ -32651,5 +32856,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "dok (nakladacia rampa)"
@@ -32853,14 +33058,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "človekom vytvorené (manmade)"
@@ -32874,5 +33079,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -32934,7 +33139,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "železničná výhybka"
@@ -32957,10 +33162,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "iná koľaj"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "nadchod nad železnicou"
@@ -32994,7 +33199,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "historická železnica(turistická)"
@@ -33039,6 +33244,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "letecké cesty"
@@ -33060,5 +33265,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "zjazdovka_čierna"
@@ -33072,5 +33277,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "zjazdovka_ľahká"
@@ -33148,8 +33353,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "Visuté cesty/Lanovky"
@@ -33165,5 +33370,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "mierna zjazdovka (piste_easy)"
@@ -33177,5 +33382,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "stredne ťažká zjazdovka (piste_intermediate)"
@@ -33189,5 +33394,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "zjazdovka pre pokročilých (piste_advanced)"
@@ -33201,5 +33406,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr "zjazdovka pre expertov (piste_expert)"
@@ -33213,5 +33418,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "zjazdovka pre freeride (piste_freeride)"
@@ -33225,5 +33430,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "zjazdovka pre začiatočníkov (piste_novice)"
@@ -33343,11 +33548,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "energia (power)"
@@ -33360,5 +33565,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "hrádza (pier)"
@@ -33372,5 +33577,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "potrubie (pipeline)"
@@ -33514,13 +33719,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "oddych (leisure)"
@@ -33534,5 +33739,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "prístav (marina)"
@@ -33628,10 +33833,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "zaujímavosti (amenity)"
@@ -33741,11 +33946,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "verejná_doprava"
@@ -34183,24 +34388,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "svetelné zariadenie"
@@ -34232,6 +34437,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "osvetlená_voda (light_water)"
@@ -34292,8 +34497,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "zdravie"
@@ -34654,26 +34859,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "obchod"
@@ -34745,8 +34950,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hotel"
@@ -34846,9 +35051,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "cestovanie"
@@ -34936,9 +35141,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "historické"
@@ -34951,5 +35156,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "lom"
@@ -34963,5 +35168,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "skládka odpadov (landfill)"
@@ -34983,5 +35188,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "(basin) kotvisko pre lode s udržiavanou výškou hladiny vody"
@@ -34995,5 +35200,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "farmy"
@@ -35016,5 +35221,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "maloobchody"
@@ -35028,5 +35233,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "závody"
@@ -35040,5 +35245,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "brownfield (opustený priemyselný objekt)"
@@ -35052,5 +35257,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "greenfield (oblasť používaná pre poľnohospodárstvo)"
@@ -35064,5 +35269,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "železničný pozemok"
@@ -35119,7 +35324,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "armáda"
@@ -35133,5 +35338,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "cintorín (cemetery)"
@@ -35144,5 +35349,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "vrchol (peak)"
@@ -35157,5 +35362,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "ľadovec (glacier)"
@@ -35169,5 +35374,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "sopka"
@@ -35221,8 +35426,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "prírodné (natural)"
@@ -35236,5 +35441,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "oblasť pokrytá krovím"
@@ -35248,5 +35453,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "vresovisko"
@@ -35260,5 +35465,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "zalesnená oblasť (woodarea)"
@@ -35272,5 +35477,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "blato (mud)"
@@ -35284,5 +35489,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "pláž (beach)"
@@ -35360,8 +35565,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "trasa (route)"
@@ -35450,12 +35655,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "hranica (boundary)"
@@ -35605,11 +35810,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "miesto"
@@ -35623,5 +35828,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -35990,4 +36195,42 @@
 msgstr ""
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Teraz môžu byť spojené iba dve plochy(areas)."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Spojená prekrývajúca sa plocha"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Zadajte hodnoty pre všetky konflikty"
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Riešenie konfliktov"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Spojiť plochy: Vymazať krátke cesty"
+
+#~ msgid "Closed Way"
+#~ msgstr "Uzavretá cesta"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr "Chyba: Neočakávaný riadok ''{0}'' v obsahu záložiek zo servera"
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr ""
+#~ "Chyba: Nedovolená zdvojená hodnota ''{0}'' v riadku ''{1}'' v obsahu "
+#~ "záložiek zo servera"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Neúspešné nahratie záložiek z ''{0}'' pre bezpečnostné dôvody. Výnimka "
+#~ "bola: {1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>Nemôžem zapísať záložku.<br>{0}</html>"
+
 #~ msgid "Move"
 #~ msgstr "Presunúť"
@@ -36541,7 +36784,4 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Vyriešiť {0} konfliktov v {1} objektoch."
-
-#~ msgid "Split way segment"
-#~ msgstr "Rozdeliť segment cesty"
 
 #~ msgid "The selected way does not contain the selected node."
@@ -37134,7 +37374,4 @@
 #~ msgstr "Vyriešte rozpor v poradovom čísle relácie {0}"
 
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Zlé číslo parametrov pre operátor bodov."
-
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Nesprávna hodnota pre id operátor: {0}.  Číslo je očakávané."
Index: /applications/editors/josm/i18n/po/sl.po
===================================================================
--- /applications/editors/josm/i18n/po/sl.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/sl.po	(revision 23252)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
 "PO-Revision-Date: 2010-09-02 21:51+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:53+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -83,6 +83,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -229,5 +229,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -249,5 +248,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -269,7 +268,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -390,5 +390,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -415,4 +415,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -420,5 +421,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -453,5 +454,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Informacije"
@@ -659,8 +660,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -672,5 +673,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Izbriši"
@@ -846,14 +847,14 @@
 msgstr "Zaključek dela z aplikacijo."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr ""
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr ""
@@ -896,26 +897,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -926,5 +923,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -932,37 +929,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+msgid "Reverting changes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Podvojena vozlišča"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -970,33 +996,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Razreši neskladja"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Razdeli pot {0} na {1} delov"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr ""
@@ -1497,12 +1512,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1523,6 +1537,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1557,6 +1571,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Napaka"
@@ -1588,5 +1602,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1696,5 +1710,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Zapri"
@@ -1720,5 +1734,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr ""
@@ -1750,5 +1764,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1934,10 +1948,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Razmnoži v {0} vozlišč"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2332,4 +2346,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2476,17 +2491,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Premakni elemente"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Premakni jih"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Razveljavi premik"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2496,9 +2511,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Za izbor predmetov v pravokotniku izpustite miškin gumb."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2507,9 +2522,9 @@
 "najbližjo točko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Za prenehanje vrtenja izpustite miškin gumb."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2962,4 +2977,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3341,5 +3357,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Nova vrednost"
@@ -3412,15 +3427,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3429,5 +3444,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3436,5 +3451,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3443,5 +3458,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3450,5 +3465,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3456,5 +3471,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3463,5 +3478,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3470,5 +3485,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3477,5 +3492,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3484,15 +3499,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
@@ -3507,23 +3511,4 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
 msgstr ""
 
@@ -3938,12 +3923,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, 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:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
 msgstr ""
 
@@ -4065,5 +4064,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "zgradba"
@@ -4235,10 +4234,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Uporabniško ime"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4409,8 +4408,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4628,5 +4627,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5157,9 +5156,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5172,9 +5171,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5260,5 +5258,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "brez"
@@ -5546,5 +5544,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5642,11 +5640,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Dodaj"
@@ -5991,10 +5989,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr ""
@@ -7643,9 +7641,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7654,13 +7652,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7668,10 +7666,10 @@
 msgstr "<različno>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Sprememba vrednosti?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7682,5 +7680,5 @@
 msgstr[3] "Spremeni lastnosti do {0} predmetov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7691,77 +7689,86 @@
 msgstr[3] "Spremenili boste do {0} predmete."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Izberite ključ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Izberite vrednost"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Lastnosti/Članstva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Lastnosti izbranih predmetov"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Latnosti: {0} / Članstva: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Lastnosti / Članstva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Spremeni relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Naj res izbrišem izbor iz relacije {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Izbriši izbrani ključ vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Dodaj nov par ključ/vrednost vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Spremeni vrednost izbranega ključa vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Lastnosti izbranih predmetov"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr ""
@@ -8489,5 +8496,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9075,5 +9082,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11218,13 +11225,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Napredne nastavitve"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11232,18 +11239,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Trenutna vrednost je privzeta"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Privzeta vrednost je ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Prosim izberite vrstico za izbris."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Vpišite nov par ključ/vrednost"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11251,20 +11269,13 @@
 msgstr "Prosim izberite vrstico za urejanje."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Nova vrednost za {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Prosim izberite vrstico za izbris."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Vpišite nov par ključ/vrednost"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Vrednost"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -11815,5 +11826,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr ""
@@ -12281,5 +12292,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12289,10 +12305,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12302,5 +12318,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12309,5 +12325,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12316,5 +12332,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12323,9 +12339,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Prednastavljene oznake"
@@ -14196,5 +14212,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "opis ni na voljo"
@@ -14211,5 +14227,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr ""
@@ -14578,5 +14599,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -14665,4 +14686,28 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Spremeni lastnosti"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Uvozi slike"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Uvozi slike"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Napaka pri razčlenjevanju"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15021,4 +15066,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15039,5 +15085,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15045,5 +15091,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -15528,8 +15574,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr ""
@@ -15590,6 +15636,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr ""
@@ -16052,6 +16098,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Prazna plast"
@@ -16269,6 +16315,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+msgid "External tool error"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16291,5 +16344,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -16996,5 +17049,5 @@
 msgstr ""
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr ""
@@ -17762,4 +17815,9 @@
 msgid "Enter weight values"
 msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Nova vrednost za {0}"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
@@ -19695,5 +19753,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr ""
@@ -19829,140 +19887,145 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Predvajanje/Premor"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Nazaj"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Skok naprej"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Naprej"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Hitreje"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Počasneje"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -19979,4 +20042,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20073,6 +20140,12 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "regularni izraz"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20100,5 +20173,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Naziv v meniju"
@@ -20109,5 +20182,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
+msgid "Get Capabilities"
 msgstr ""
 
@@ -20139,5 +20212,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "Povezava do WMS"
@@ -20269,24 +20342,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20297,80 +20370,80 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Naloži vidne ploščice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Spremeni ločljivost"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Shrani plast WMS v datoteko"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Naloži plast WMS iz datoteke"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Nepodprta različica datoteke WMS; našel {0}, pričakoval {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Samodejno sprejemanje"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20379,5 +20452,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20387,73 +20460,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Odpri prazno plast WMS za nalaganje podatkov iz datoteke"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Nastavitve WMS vstavka"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Spremeni seznam strežnikov WMS, ki so prikazani v meniju WMS vstavka"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Povečava"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Odstrani"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20516,5 +20600,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr ""
@@ -20808,6 +20892,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -20817,15 +20907,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr ""
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -20837,10 +20927,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -20848,10 +20938,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -20860,15 +20950,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -20877,20 +20967,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -20900,15 +20990,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -20916,5 +21006,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -20924,15 +21014,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -20941,5 +21031,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -20949,20 +21039,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -20970,5 +21060,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -20976,5 +21066,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -20983,5 +21073,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -20990,10 +21080,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21001,15 +21091,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21019,5 +21109,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21026,10 +21116,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21038,5 +21128,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21044,16 +21134,30 @@
 msgstr ""
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+msgid "Plugin for Seamap Editor"
+msgstr ""
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21063,15 +21167,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21080,5 +21184,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21087,5 +21191,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21094,10 +21198,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21106,5 +21210,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21114,5 +21218,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21121,20 +21225,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21143,5 +21247,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22035,4 +22139,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22040,5 +22188,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "krožišče"
@@ -22545,5 +22693,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr ""
@@ -22592,5 +22740,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr ""
@@ -22623,6 +22771,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr ""
@@ -23781,5 +23929,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr ""
@@ -23977,7 +24125,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr ""
@@ -24253,8 +24401,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr ""
@@ -25690,5 +25838,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr ""
@@ -26961,32 +27109,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "šport"
@@ -28783,9 +28965,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr ""
@@ -30448,5 +30630,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr ""
@@ -30727,5 +30909,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -30743,5 +30925,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr ""
@@ -31118,7 +31300,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr ""
@@ -31210,9 +31392,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr ""
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31222,5 +31412,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr ""
@@ -31239,7 +31429,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "Železniški peron"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr ""
@@ -31254,5 +31457,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr ""
@@ -31266,5 +31469,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr ""
@@ -31278,5 +31481,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr ""
@@ -31290,5 +31493,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr ""
@@ -31492,14 +31695,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr ""
@@ -31513,5 +31716,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -31573,7 +31776,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr ""
@@ -31596,10 +31799,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr ""
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr ""
@@ -31633,7 +31836,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr ""
@@ -31678,6 +31881,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr ""
@@ -31699,5 +31902,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr ""
@@ -31711,5 +31914,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr ""
@@ -31787,8 +31990,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr ""
@@ -31804,5 +32007,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr ""
@@ -31816,5 +32019,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr ""
@@ -31828,5 +32031,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr ""
@@ -31840,5 +32043,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr ""
@@ -31852,5 +32055,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr ""
@@ -31864,5 +32067,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr ""
@@ -31982,11 +32185,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr ""
@@ -31999,5 +32202,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr ""
@@ -32011,5 +32214,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr ""
@@ -32153,13 +32356,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr ""
@@ -32173,5 +32376,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr ""
@@ -32267,10 +32470,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr ""
@@ -32380,11 +32583,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr ""
@@ -32822,24 +33025,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr ""
@@ -32871,6 +33074,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr ""
@@ -32931,8 +33134,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr ""
@@ -33293,26 +33496,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr ""
@@ -33384,8 +33587,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr ""
@@ -33485,9 +33688,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr ""
@@ -33575,9 +33778,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr ""
@@ -33590,5 +33793,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr ""
@@ -33602,5 +33805,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr ""
@@ -33622,5 +33825,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr ""
@@ -33634,5 +33837,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr ""
@@ -33655,5 +33858,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr ""
@@ -33667,5 +33870,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr ""
@@ -33679,5 +33882,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr ""
@@ -33691,5 +33894,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr ""
@@ -33703,5 +33906,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr ""
@@ -33758,7 +33961,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr ""
@@ -33772,5 +33975,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr ""
@@ -33783,5 +33986,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr ""
@@ -33796,5 +33999,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr ""
@@ -33808,5 +34011,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr ""
@@ -33860,8 +34063,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr ""
@@ -33875,5 +34078,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr ""
@@ -33887,5 +34090,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr ""
@@ -33899,5 +34102,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr ""
@@ -33911,5 +34114,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr ""
@@ -33923,5 +34126,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr ""
@@ -33999,8 +34202,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr ""
@@ -34089,12 +34292,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr ""
@@ -34244,11 +34447,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr ""
@@ -34262,5 +34465,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -34629,4 +34832,7 @@
 msgstr ""
 
+#~ msgid "Solve Conflicts"
+#~ msgstr "Razreši neskladja"
+
 #~ msgid "Move"
 #~ msgstr "Premakni"
@@ -34988,7 +35194,4 @@
 #~ msgstr "Odpri datoteko (če .gpx, potem kot surov GPS)"
 
-#~ msgid "Error while parsing"
-#~ msgstr "Napaka pri razčlenjevanju"
-
 #~ msgid "parameter '{0}' must not be null"
 #~ msgstr "parameter '{0}' ne sme biti ničen"
Index: /applications/editors/josm/i18n/po/sv.po
===================================================================
--- /applications/editors/josm/i18n/po/sv.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/sv.po	(revision 23252)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
 "PO-Revision-Date: 2010-09-02 22:06+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -234,5 +234,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -254,5 +253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -274,7 +273,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -397,5 +397,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -422,4 +422,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -427,5 +428,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -460,5 +461,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Information"
@@ -672,8 +673,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -685,5 +686,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Ta bort"
@@ -860,14 +861,14 @@
 msgstr "Avsluta programmet."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Helskärmsvy"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Växla helskärmsvy"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Växla helskärmsvy"
@@ -910,26 +911,22 @@
 msgstr "Visa objektinformation om OSM noder, vägar eller relationer."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Förena överlappande ytor"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Förena ytor som överlappar varandra"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "Välj åtminstone en stängd väg som ska slås ihop"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "För närvarande kan enbart upp till två ytor förenas."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" är inte sluten, och kan därför inte förenas med andra ytor."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -940,5 +937,5 @@
 msgstr[1] "De valda sträckorna har noder utanför det nedladdade dataområdet."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -946,37 +943,67 @@
 msgstr "Detta kan leda till att noder raderas av misstag."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Är du verkligen säker på att du vill fortsätta?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Avbryt om du är osäker"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Inget överlapp funnet. Ingenting har ändrats."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Drycker"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Tar bort dubblettnoder..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "La till nod vid alla korsande sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Ta bort sträckor som inte är del av en inre multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Korrigera relationer"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Slog ihop område som låg ovanpå sig själv"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Slog ihop områden som låg ovanpå varandra"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -986,33 +1013,22 @@
 "att det inte har uppstått några fel."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Ange värden för alla konflikter"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Jämka konflikter"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Korrigera taggkonflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Dela delsträcka"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Tog bort element från relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Slå ihop områden: Ta bort korta sträckor"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Sluten sträcka"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Ta bort taggar från inre sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Ytsammanslagningsfunktion"
@@ -1529,12 +1545,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1555,6 +1570,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1589,6 +1604,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Fel"
@@ -1620,5 +1635,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1732,5 +1747,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Stäng"
@@ -1756,5 +1771,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Nej, avbryt"
@@ -1786,5 +1801,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1985,10 +2000,10 @@
 msgstr "Frigjord nod"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Duplicera till {0} noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2385,4 +2400,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2533,17 +2549,17 @@
 msgstr[1] "Lägg till och flytta en virtuell ny nod till {0} vägar."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Flytta element"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Flytta"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Ångra flytt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2556,9 +2572,9 @@
 "Säker på att du vill flytta dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Släpp musknappen för att välja objekten i rektangeln."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2567,9 +2583,9 @@
 "nod."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Släpp musknappen för att sluta rotera."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3056,4 +3072,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3442,5 +3459,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Nytt värde"
@@ -3513,15 +3529,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Fel i konfigurationsfilen på raderna {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3530,5 +3546,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3537,5 +3553,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3544,5 +3560,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3551,5 +3567,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3557,5 +3573,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3564,5 +3580,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3571,5 +3587,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3578,20 +3594,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
 "Warning: Failed to initialize preferences.Failed to reset preference file to "
 "default: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 msgstr ""
 
@@ -3609,23 +3614,4 @@
 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:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4033,12 +4019,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "Felaktigt antal parametrar för nodoperator."
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Fel uppstod när cache-biblioteket skulle skapas: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, 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:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
 msgstr ""
 
@@ -4158,5 +4160,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "byggnad (building)"
@@ -4332,10 +4334,10 @@
 msgstr "Om angivet så återställ konfigurationen istället för att läsa in den."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Användarnamn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4506,8 +4508,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4725,5 +4727,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5254,9 +5256,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5269,9 +5271,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5357,5 +5358,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "inget"
@@ -5643,5 +5644,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5740,11 +5741,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Lägg till"
@@ -6089,10 +6090,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr ""
@@ -7743,9 +7744,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Lägg till egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7754,13 +7755,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7768,10 +7769,10 @@
 msgstr "<olika>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Ändra värden?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7780,5 +7781,5 @@
 msgstr[1] "Ändra egenskaper för upp till {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7787,77 +7788,86 @@
 msgstr[1] "Detta kommer att ändra upp till {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Välj en nyckel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Välj ett värde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 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/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Egenskaper/Roller"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Egenskaper för valda objekt."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Medlem av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Roller"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Ändra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Ta bort från relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Verkligen ta bort det valda från relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Ta bort den valda nyckeln från alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Ta bort egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Lägg till ett nytt nyckel/värde-par till alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Redigera värdet av den valda nyckeln för alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Egenskaper för valda objekt."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr ""
@@ -8586,5 +8596,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9177,5 +9187,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11338,13 +11348,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Avancerade inställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Ange inställningar direkt. Använd med försiktighet!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11352,19 +11362,30 @@
 msgstr "Sök: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Nuvarande värde är förval."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Nuvarande värde är ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr ""
 "Förvalt värde är för närvarande okänt (inställningen har inte använts än)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Välj vilken rad du vill ta bort."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Ange ett nytt nyckel/värde-par"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11372,20 +11393,13 @@
 msgstr "Välj vilken rad du vill ändra."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Nytt värde för {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Välj vilken rad du vill ta bort."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Ange ett nytt nyckel/värde-par"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Värde"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -11962,5 +11976,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Aktivera inbyggda förval"
@@ -12432,5 +12446,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Kunde inte läsa källan till snabbval för taggning: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12440,10 +12459,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12453,5 +12472,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12460,5 +12479,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12467,5 +12486,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12474,9 +12493,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Sortera snabbvalsmenyn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Snabbval för taggning"
@@ -14347,5 +14366,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "ingen beskrivning tillgänglig"
@@ -14362,5 +14381,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr ""
@@ -14733,5 +14757,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -14828,4 +14852,28 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Ändra egenskaper"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Importera bilder"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Importerade bilder"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Fel vid inläsning av sida{0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15184,4 +15232,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15202,5 +15251,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15208,5 +15257,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -15691,8 +15740,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "vatten"
@@ -15753,6 +15802,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "adress"
@@ -16221,6 +16270,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Tomt lager"
@@ -16440,6 +16489,13 @@
 msgstr "Inget GPX-datalager kunde hittas."
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+msgid "External tool error"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16462,5 +16518,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17180,5 +17236,5 @@
 msgstr ""
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -17956,4 +18012,9 @@
 msgid "Enter weight values"
 msgstr "Ange viktvärden"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Nytt värde för {0}"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
@@ -19910,5 +19971,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "yta (area)"
@@ -20052,140 +20113,145 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Spela/pausa"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Tillbaka"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Hoppa framåt"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Framåt"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Snabbare"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Långsammare"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20202,4 +20268,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20296,6 +20366,12 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Ange sökuttryck"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20323,5 +20399,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Menynamn"
@@ -20332,6 +20408,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Sportfaciliteteter"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20362,5 +20439,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "URL för WMS"
@@ -20492,24 +20569,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-lager ({0}), hämtas automatiskt i zoomläge {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-lager ({0}), hämtas i zoomläge {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20520,80 +20597,80 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Hämta de rutor som syns"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr "Den begärda ytan är för stor. Zooma in lite eller ändra upplösning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Ändra upplösning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Läs om felaktiga rutor"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Alfakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Spara WMS-lagret till en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Hämta WMS-lager från en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "WMS-filversion som ej stöds; funnen {0}, förväntad {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Fel filformat"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Fel vid läsning av fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Automatisk hämtning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20602,5 +20679,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20610,74 +20687,85 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 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"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Inställningar för WMS-insticksmodulen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 "Justera listan över WMS-servrar som visas i menyn för WMS-insticksmodulen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Zooma:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Menynamn (Förval)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "WMS-url (Förval)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Ta bort"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20742,5 +20830,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "skog"
@@ -21034,6 +21122,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -21043,15 +21137,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr ""
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -21063,10 +21157,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -21074,10 +21168,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21086,15 +21180,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21103,20 +21197,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21126,15 +21220,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21142,5 +21236,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21150,15 +21244,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr "Konvertera enkelt en yta till en multipolygon."
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21169,5 +21263,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21177,20 +21271,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21198,5 +21292,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21204,5 +21298,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21211,5 +21305,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21218,10 +21312,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21229,15 +21323,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21247,5 +21341,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21256,10 +21350,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21268,5 +21362,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21274,16 +21368,30 @@
 msgstr ""
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+msgid "Plugin for Seamap Editor"
+msgstr ""
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21293,15 +21401,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21310,5 +21418,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21317,5 +21425,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21324,10 +21432,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21336,5 +21444,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21344,5 +21452,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21351,20 +21459,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21373,5 +21481,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22265,4 +22373,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22270,5 +22422,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "rondell"
@@ -22775,5 +22927,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "bostadsgata"
@@ -22822,5 +22974,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "tillfartsväg"
@@ -22853,6 +23005,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "under byggnad"
@@ -24011,5 +24163,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "kärr"
@@ -24207,7 +24359,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "cykel"
@@ -24483,8 +24635,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "räls"
@@ -25920,5 +26072,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "terminal"
@@ -27191,32 +27343,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "sport"
@@ -29013,9 +29199,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr ""
@@ -30678,5 +30864,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "tunnelbana"
@@ -30957,5 +31143,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -30973,5 +31159,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "förlegad"
@@ -31348,7 +31534,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "landsvägsspår"
@@ -31440,9 +31626,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr ""
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31452,5 +31646,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr ""
@@ -31469,7 +31663,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "landsvägsspår"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "vändplats"
@@ -31484,5 +31691,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr ""
@@ -31496,5 +31703,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "flodbank"
@@ -31508,5 +31715,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "bäck"
@@ -31520,5 +31727,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "hamn"
@@ -31722,14 +31929,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "byggnadsverk"
@@ -31743,5 +31950,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -31803,7 +32010,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "järnvägspunkt"
@@ -31826,10 +32033,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr ""
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr ""
@@ -31863,7 +32070,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr ""
@@ -31908,6 +32115,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr ""
@@ -31929,5 +32136,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr ""
@@ -31941,5 +32148,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr ""
@@ -32017,8 +32224,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "linbana"
@@ -32034,5 +32241,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr ""
@@ -32046,5 +32253,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr ""
@@ -32058,5 +32265,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr ""
@@ -32070,5 +32277,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr ""
@@ -32082,5 +32289,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr ""
@@ -32094,5 +32301,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr ""
@@ -32212,11 +32419,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "kraft"
@@ -32229,5 +32436,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "pir"
@@ -32241,5 +32448,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "rörledning"
@@ -32383,13 +32590,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "fritid"
@@ -32403,5 +32610,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "marina"
@@ -32497,10 +32704,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "inrättning"
@@ -32610,11 +32817,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "trafikinrättning"
@@ -33052,24 +33259,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr ""
@@ -33101,6 +33308,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr ""
@@ -33161,8 +33368,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "hälsa"
@@ -33523,26 +33730,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "affär"
@@ -33614,8 +33821,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hotell"
@@ -33715,9 +33922,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "turism"
@@ -33805,9 +34012,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "historisk"
@@ -33820,5 +34027,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "stenbrott"
@@ -33832,5 +34039,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr ""
@@ -33852,5 +34059,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "hamnbassäng"
@@ -33864,5 +34071,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "gårdsplan"
@@ -33885,5 +34092,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "detaljhandel"
@@ -33897,5 +34104,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "industri"
@@ -33909,5 +34116,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr ""
@@ -33921,5 +34128,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr ""
@@ -33933,5 +34140,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr ""
@@ -33988,7 +34195,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "militär"
@@ -34002,5 +34209,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "begravningsplats"
@@ -34013,5 +34220,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "topp"
@@ -34026,5 +34233,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "glaciär"
@@ -34038,5 +34245,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "vulkan"
@@ -34090,8 +34297,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "naturfenomen"
@@ -34105,5 +34312,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "buskage"
@@ -34117,5 +34324,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "hed"
@@ -34129,5 +34336,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr ""
@@ -34141,5 +34348,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "lera"
@@ -34153,5 +34360,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "strand"
@@ -34229,8 +34436,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "rutt"
@@ -34319,12 +34526,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "gräns"
@@ -34474,11 +34681,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "plats"
@@ -34492,5 +34699,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -34859,4 +35066,22 @@
 msgstr ""
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "För närvarande kan enbart upp till två ytor förenas."
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Slog ihop område som låg ovanpå sig själv"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Ange värden för alla konflikter"
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Jämka konflikter"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Slå ihop områden: Ta bort korta sträckor"
+
+#~ msgid "Closed Way"
+#~ msgstr "Sluten sträcka"
+
 #~ msgid "Move"
 #~ msgstr "Flytta"
@@ -34896,7 +35121,4 @@
 #~ 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 "Open in Browser"
@@ -34927,7 +35149,4 @@
 #~ msgid "Conflicting relation"
 #~ msgstr "Relationskonflikt"
-
-#~ msgid "Split way segment"
-#~ msgstr "Dela delsträcka"
 
 #~ msgid "different"
@@ -35959,7 +36178,4 @@
 #~ "primitiven."
 
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Felaktigt antal parametrar för nodoperator."
-
 #~ msgid ""
 #~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
Index: /applications/editors/josm/i18n/po/tr.po
===================================================================
--- /applications/editors/josm/i18n/po/tr.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/tr.po	(revision 23252)
@@ -10,6 +10,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
-"PO-Revision-Date: 2010-09-06 00:59+0000\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
+"PO-Revision-Date: 2010-09-12 14:01+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: Türkçe\n"
@@ -18,5 +18,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:56+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -84,6 +84,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -232,5 +232,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -252,5 +251,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -272,7 +271,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -393,5 +393,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -418,4 +418,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -423,5 +424,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -456,5 +457,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Bilgi"
@@ -666,8 +667,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -679,5 +680,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Sil"
@@ -853,14 +854,14 @@
 msgstr "Programı Kapat."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Tam Ekran Görünüm"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Tam ekran görünümüne geç"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Tam Ekran Görünümüne geç"
@@ -903,26 +904,22 @@
 msgstr "OSM yolları, nodları ve ilişkileri hakkında nesne bilgisini göster."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Örtüşen alanları birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Birbiriyle örtüşen alanları birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -933,5 +930,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -939,37 +936,66 @@
 msgstr "Bu kazayla silinmiş nodları yönetebilir."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Devam etmek istediğinize emin misiniz?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "lütfen emin değilseniz iptal ediniz"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Kesişme bulunamadı. Hiçbir şey değiştirilmedi."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+msgid "Reverting changes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Çift noktalar kaldırılıyor..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "İlişkileri düzelt"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Otomatik olarak üstüste gelen alanlar birleştirildi"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Üstüste gelen alanlar birleştirildi"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -977,33 +1003,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Bütün çakışmaları için yeni değerler gir."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Çakışmaları Çöz"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Etiket çakışmalarını düzelt"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Yol segmentini ayrıştır"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Birleşme Alanları: Kısayolları Kaldır"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Kapatılmış Yol"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Birleşme Alanları Fonksiyonu"
@@ -1503,12 +1518,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1529,6 +1543,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1563,6 +1577,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Hata"
@@ -1594,5 +1608,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1703,5 +1717,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Kapat"
@@ -1727,5 +1741,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr ""
@@ -1757,5 +1771,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1940,10 +1954,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "{0} kavşak değiştirildi"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2337,4 +2351,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2484,17 +2499,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Taşı"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Taşımayı geri al"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2504,9 +2519,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 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."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2515,9 +2530,9 @@
 "yapıştır."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Dönmeyi durdurmak için fare düğmesini bırakınız."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2975,4 +2990,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3358,5 +3374,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Yeni Değer"
@@ -3429,15 +3444,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3446,5 +3461,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3453,5 +3468,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3460,5 +3475,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3467,5 +3482,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3473,5 +3488,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3480,5 +3495,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3487,5 +3502,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3494,20 +3509,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
 "Warning: Failed to initialize preferences.Failed to reset preference file to "
 "default: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 msgstr ""
 
@@ -3525,23 +3529,4 @@
 msgid "Could not load preferences from server."
 msgstr "Tercihler serverdan alınamadı."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -3946,12 +3931,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Hafıza alanı oluşturulamadı(cache): {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, 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:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
 msgstr ""
 
@@ -4070,5 +4070,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "yapılar"
@@ -4244,10 +4244,10 @@
 msgstr "Belirlenmişse, konfigürsayonu sıfırla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "KullanıcıAdı"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4418,8 +4418,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4637,5 +4637,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5166,9 +5166,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5181,9 +5181,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5269,5 +5268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "boş"
@@ -5553,5 +5552,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5649,11 +5648,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Ekle"
@@ -5998,10 +5997,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr ""
@@ -7650,9 +7649,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Özellik Ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7661,13 +7660,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7675,10 +7674,10 @@
 msgstr "<farklı>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Değerleri Değiştir?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7686,5 +7685,5 @@
 msgstr[0] "Değerleri {0} obje için değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7692,77 +7691,86 @@
 msgstr[0] "İşlem {0} objeyi değiştirecek."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Lütfen bir anahtar seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Lütfen bir değer seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 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/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Özellikler/Üyelikler"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Seçili objenin özellikleri"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Üyesi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Özellik: {0} / Üyelik: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Özellik / Üyelik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "İlişkiyi değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Gerçekten seçili kısmı ilişkiden silmek istiyormusun {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Seçili anahtarı her objeden sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Özelliği Sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Her obje için yeni bir anahtar/değer çifti ekleyiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Seçili anahtarın değerini her obje için düzenle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Seçili objenin özellikleri"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr ""
@@ -8488,5 +8496,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9074,5 +9082,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11220,13 +11228,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "İleri Tercihler"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Tercihleri doğrudan ayarla. Dikkatli kullanılmalı!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11234,18 +11242,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Seçim varsayılan değer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Varsayılan değer ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr "Varsayılan değer bilinmiyor (ayar henuz kullanılmadı)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Silmek için bir satır seçiniz."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Yeni bir anahtar/değer çifti gir"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11253,20 +11272,13 @@
 msgstr "Editlemek için bir satır seçiniz."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "{0} için yeni değer"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Silmek için bir satır seçiniz."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Yeni bir anahtar/değer çifti gir"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Değer"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -11822,5 +11834,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Önceden tanımlanmış ayarları etkinleştir"
@@ -12290,5 +12302,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Etiketteki özellikler okunamadı: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12298,10 +12315,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12311,5 +12328,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12318,5 +12335,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12325,5 +12342,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12332,9 +12349,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Etiketleme Ayarları"
@@ -14201,5 +14218,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "Açıklama mevcut değil"
@@ -14216,5 +14233,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr ""
@@ -14583,5 +14605,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -14677,4 +14699,28 @@
 msgstr ""
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Özellikleri Değiştir"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Görüntüleri içeri al"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "İçeri alınan görüntüler"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Sayfa {0} yüklerken hata oluştu"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15033,4 +15079,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr ""
@@ -15051,5 +15098,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr ""
@@ -15057,5 +15104,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr ""
@@ -15540,8 +15587,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "su"
@@ -15602,6 +15649,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "adres"
@@ -16064,6 +16111,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Boş Tabaka"
@@ -16281,6 +16328,13 @@
 msgstr "GPX veri tabaksı bulunamadı."
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+msgid "External tool error"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16303,5 +16357,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr ""
@@ -17017,5 +17071,5 @@
 msgstr ""
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "Tabakaları aç"
@@ -17789,4 +17843,9 @@
 msgid "Enter weight values"
 msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "{0} için yeni değer"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
@@ -19730,5 +19789,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "alan"
@@ -19866,140 +19925,145 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Oynat/Dondur"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
+msgstr "Geri"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "İleri atla"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "İleri"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Hızlı"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Yavaş"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+msgid "Loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20016,4 +20080,8 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:127
 msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
 msgstr ""
 
@@ -20110,6 +20178,12 @@
 msgstr ""
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Arama ifadesini girin"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20137,5 +20211,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Menu İsmi"
@@ -20146,6 +20220,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Spor Aktivite"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20176,5 +20251,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "WMS linki"
@@ -20306,24 +20381,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS tabaksı ({0}), otomatik indirildi, görüntü seviyesi {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS tabakası ({0}), görüntü seviyesi {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20334,17 +20409,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Görünen mozaikleri indir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20353,63 +20428,63 @@
 "değiştirin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Çözünürlüğü değiştir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "WMS tabakasını dosyaya kaydet"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "WMS tabakasını dosyadan yükle"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Desteklenmeyen WMS versiyonu; bulunan {0}, istenen {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Dosya Format Hatası"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Dosya Yüklemede Sorun"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Otomatik indir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20418,5 +20493,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20426,73 +20501,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Veri yüklemek için boş bir WMS tabakası aç"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "WMS Eklenti Tercihleri"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "WMS eklenti menusundeki, WMS server listesini değiştir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Menu ismi (Varsayılan)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "WMS linki (Varsayılan)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Kaldır"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20559,5 +20645,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "orman"
@@ -20851,6 +20937,12 @@
 msgstr ""
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -20860,15 +20952,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr ""
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -20880,10 +20972,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr ""
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -20891,10 +20983,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -20903,15 +20995,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr ""
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr ""
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -20920,20 +21012,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -20943,15 +21035,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -20959,5 +21051,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -20967,15 +21059,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -20984,5 +21076,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -20992,20 +21084,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21013,5 +21105,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21019,5 +21111,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21026,5 +21118,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21033,10 +21125,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21044,15 +21136,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21062,5 +21154,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21069,10 +21161,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21081,5 +21173,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21087,16 +21179,30 @@
 msgstr ""
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+msgid "Plugin for Seamap Editor"
+msgstr ""
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21106,15 +21212,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21123,5 +21229,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21130,5 +21236,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21137,10 +21243,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21149,5 +21255,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21157,5 +21263,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21164,20 +21270,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21186,5 +21292,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22078,4 +22184,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22083,5 +22233,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "döner kavşak"
@@ -22588,5 +22738,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "yerleşim_alanı"
@@ -22635,5 +22785,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "servis"
@@ -22666,6 +22816,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "inşaat"
@@ -23824,5 +23974,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "batak"
@@ -24020,7 +24170,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "bisiklet"
@@ -24296,8 +24446,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "demiryolu"
@@ -25733,5 +25883,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "terminal"
@@ -27004,32 +27154,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "spor"
@@ -28826,9 +29010,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "yeşil"
@@ -30491,5 +30675,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "metro"
@@ -30770,5 +30954,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -30786,5 +30970,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "kırılmış"
@@ -31161,7 +31345,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "araçyolu_hattı"
@@ -31253,9 +31437,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr ""
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31265,5 +31457,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr ""
@@ -31282,7 +31474,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "araçyolu_hattı"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "döner kavşak"
@@ -31297,5 +31502,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr ""
@@ -31309,5 +31514,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "riverbank"
@@ -31321,5 +31526,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "akış"
@@ -31333,5 +31538,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "iskele"
@@ -31535,14 +31740,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "insan yapımı"
@@ -31556,5 +31761,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -31616,7 +31821,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "demiryolu_noktası"
@@ -31639,10 +31844,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "başka_demiryolu"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "demiryolu_üzeri"
@@ -31676,7 +31881,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "eski_demiryolu"
@@ -31721,6 +31926,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "havayolu"
@@ -31742,5 +31947,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "havayolu_ağır"
@@ -31754,5 +31959,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "hafif_hafif"
@@ -31830,8 +32035,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "havayolu"
@@ -31847,5 +32052,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "basit_meydan"
@@ -31859,5 +32064,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "orta_meydan"
@@ -31871,5 +32076,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "büyük_meydan"
@@ -31883,5 +32088,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr ""
@@ -31895,5 +32100,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "acemiKullanıcı_meydanı"
@@ -31907,5 +32112,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "acemiKullanıcı_meydanı"
@@ -32025,11 +32230,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "güç"
@@ -32042,5 +32247,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "iskele"
@@ -32054,5 +32259,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "suhattı"
@@ -32196,13 +32401,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "dinlenme_yeri"
@@ -32216,5 +32421,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr ""
@@ -32310,10 +32515,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "dinlenme_yeri"
@@ -32423,11 +32628,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "tail_trafiği"
@@ -32865,24 +33070,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "eski_sokak_lambası"
@@ -32914,6 +33119,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "su_lambası"
@@ -32974,8 +33179,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "sağlık"
@@ -33336,26 +33541,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "alışveriş"
@@ -33427,8 +33632,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "hotel"
@@ -33528,9 +33733,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "turizm"
@@ -33618,9 +33823,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "tarihi"
@@ -33633,5 +33838,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "taş_ocağı"
@@ -33645,5 +33850,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "toprak_doldurma"
@@ -33665,5 +33870,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "havza"
@@ -33677,5 +33882,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "çiftlik"
@@ -33698,5 +33903,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "perakende"
@@ -33710,5 +33915,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "endüstri"
@@ -33722,5 +33927,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "ağaçsız_alan"
@@ -33734,5 +33939,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "yeşil_alan"
@@ -33746,5 +33951,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "demiryolu"
@@ -33801,7 +34006,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "askeri"
@@ -33815,5 +34020,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "mezarlık"
@@ -33826,5 +34031,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "zirve"
@@ -33839,5 +34044,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "buzul"
@@ -33851,5 +34056,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "volkanik"
@@ -33903,8 +34108,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "doğal"
@@ -33918,5 +34123,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "çalılık"
@@ -33930,5 +34135,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "çalılık"
@@ -33942,5 +34147,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr ""
@@ -33954,5 +34159,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "çamur"
@@ -33966,5 +34171,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "sahil"
@@ -34042,8 +34247,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "rut"
@@ -34132,12 +34337,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "sınırlar"
@@ -34287,11 +34492,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "yer"
@@ -34305,5 +34510,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -34672,4 +34877,19 @@
 msgstr ""
 
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Otomatik olarak üstüste gelen alanlar birleştirildi"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Bütün çakışmaları için yeni değerler gir."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Çakışmaları Çöz"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Birleşme Alanları: Kısayolları Kaldır"
+
+#~ msgid "Closed Way"
+#~ msgstr "Kapatılmış Yol"
+
 #~ msgid ""
 #~ "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -34984,7 +35204,4 @@
 #~ msgid "Conflicting relation"
 #~ msgstr "İlişkilerde Karışıklık"
-
-#~ msgid "Split way segment"
-#~ msgstr "Yol segmentini ayrıştır"
 
 #~ msgid "true"
@@ -35434,7 +35651,4 @@
 #~ 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?"
Index: /applications/editors/josm/i18n/po/uk.po
===================================================================
--- /applications/editors/josm/i18n/po/uk.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/uk.po	(revision 23252)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
-"PO-Revision-Date: 2010-09-10 19:15+0000\n"
-"Last-Translator: andygol <Unknown>\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
+"PO-Revision-Date: 2010-09-12 13:38+0000\n"
+"Last-Translator: bastik <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:51+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -83,6 +83,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -237,5 +237,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -257,5 +256,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -277,7 +276,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -402,5 +402,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -427,4 +427,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -432,5 +433,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -465,5 +466,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "Інформація"
@@ -674,8 +675,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -687,5 +688,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "Вилучити"
@@ -863,14 +864,14 @@
 msgstr "Вийти з програми."
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "Повноекранний режим"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "Ввімкнути/вимкнути повноекранний режим"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "Ввімкнути/вимкнути повноекранний режим"
@@ -913,27 +914,23 @@
 msgstr "Показати інформацію про лінії, точки або зв’язки OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "Об’єднати ділянки, що перекриваються"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "Об’єднати ділянки, що перекривають друг друга"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
 "Будь ласка, виберіть принаймні одну замкнену лінію, яку потрібно приєднати."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Тільки дві ділянки можуть бути зараз об’єднані"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" не замкнена, і тому не може бути приєднана"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -945,5 +942,5 @@
 msgstr[2] "Вибрані лінії містять точки поза межами завантаженої області."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -951,37 +948,67 @@
 msgstr "Це може призвести до випадкового вилучення точок."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "Ви справді бажаєте продовжити?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "Будь ласка, зупиніться, якщо ви не впевнені"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "Не знайдено перетинів. Нічого не змінено."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "Відмінити набір змін"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "Вилучення дублікатів точок…"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "Додані на всіх перетинах точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Вилучити лінії, що не належать до внутрішньої частини мультиполігону"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "Виправити зв’язки"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "Приєднана ділянка, що перекриває сама себе"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "Об’єднані ділянки, що перекриваються"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -991,33 +1018,22 @@
 "чи не виникло помилок."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "Введіть значення для всіх конфліктів."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "Розв’язати конфлікти"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "Виправити конфлікти теґів"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "Розділити лінію {0} на {1} частин"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "Вилучений зі зв’язків елемент"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "Об’єднати ділянки: вилучити короткі лінії"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "Замкнена лінія"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "Вилучити теґи з внутрішніх ліній"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "Функція об’єднання ділянок"
@@ -1559,12 +1575,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1585,6 +1600,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1619,6 +1634,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Помилка"
@@ -1650,5 +1665,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1763,5 +1778,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "Закрити"
@@ -1787,5 +1802,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "Ні, скасувати"
@@ -1817,5 +1832,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -2024,10 +2039,10 @@
 msgstr "Не прикріплена точка"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Дублювати у {0} точок"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2447,4 +2462,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2601,17 +2617,17 @@
 msgstr[2] "Додати та перемістити нову віртуальну точку {0} ліній"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "Перемістити елементи"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "Перемістити"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "Відмінити переміщення"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2624,9 +2640,9 @@
 "часто призводить до виникнення помилок. Дійсно перемістити їх ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Відпустіть кнопку миші для вибору об’єктів в прямокутнику."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2635,9 +2651,9 @@
 "об’єднання з найближчою точкою."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "Відпустіть кнопку миші, щоб зупинити обертання."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3139,4 +3155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3540,5 +3557,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Нове значення"
@@ -3613,15 +3629,15 @@
 msgstr "Неправильне значення довготи — ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Попередження: не зберігаються налаштування у ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Файл налаштувань спотворено; рядок  {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3632,5 +3648,5 @@
 "є каталогом."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3641,5 +3657,5 @@
 "каталогом.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3650,5 +3666,5 @@
 "каталог для налаштувань: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3659,5 +3675,5 @@
 "каталог для налаштувань: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3667,5 +3683,5 @@
 "налаштувань."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3676,5 +3692,5 @@
 "типовими налаштуваннями."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3685,5 +3701,5 @@
 "на файл з типовими налаштуваннями: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3694,5 +3710,5 @@
 "<br>{0}<br> та створено новий файл з типовими налаштуваннями.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3702,17 +3718,4 @@
 "Попередження: Збій ініціалізації налаштувань. Неможливо замінити файл "
 "налаштувань {0} на файл з типовими налаштуваннями."
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Помилка: Неочікуваний рядок ''{0}'' у файлі закладок ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Помилка: Невірне подвійне значення ''{0}'' у рядку ''{1}'' у файлі закладок "
-"''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3729,27 +3732,4 @@
 msgid "Could not load preferences from server."
 msgstr "Неможливо завантажити налаштування з сервера."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr "Помилка: Неочікуванний рядок ''{0}'' у переліку закладок з сервера"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-"Помилка: Невірне подвійне значення ''{0}'' в рядку ''{1}'' в переліку "
-"закладок з сервера"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"Збій завантаження закладок з ''{0}'' у зв’язку з проблемами безпеки. "
-"Помилка: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -4176,13 +4156,30 @@
 msgstr "Система координат UTM"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "Помилка створення каталогу для кешу: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Помилка: Неочікуваний рядок ''{0}'' у файлі закладок ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Помилка: Невірне подвійне значення ''{0}'' у рядку ''{1}'' у файлі закладок "
+"''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr "<html>Неможливо прочитати закладки з<br>''{0}''<br>Помилка: {1}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>Неможливо створити закладку.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4302,5 +4299,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "будівля"
@@ -4479,10 +4476,10 @@
 "зчитування."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Логін"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4672,8 +4669,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4900,5 +4897,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5471,9 +5468,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5486,9 +5483,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5575,5 +5571,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "нічого"
@@ -5881,5 +5877,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5986,11 +5982,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "Додати"
@@ -6335,10 +6331,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "Вибрати зі списку зв’язків"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "Вибрати зв’язок зі списку зв’язків"
@@ -8047,9 +8043,9 @@
 msgstr "Недійсний URL запиту отримання набору змін"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "Додати параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -8059,13 +8055,13 @@
 msgstr[2] "Це змінить {0} об’єктів."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "Пусте значення вилучає теґ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -8073,10 +8069,10 @@
 msgstr "<інший>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "Змінити значення?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -8086,5 +8082,5 @@
 msgstr[2] "Зміна властивостей {0} об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -8094,77 +8090,86 @@
 msgstr[2] "Це змінить до {0} об’єктів."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "Будь ласка, оберіть ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "Будь ласка, оберіть значення"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 msgid "Please select the objects you want to change properties for."
 msgstr "Будь ласка, оберіть об’єкти для зміни параметрів."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "Параметри/Членство"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "Параметри обраних об’єктів."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "Член групи"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr "Розташування"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Параметрів: {0} / Членів: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "Параметри / Члени"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "Змінити зв’язок"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "Вилучити із зв’язку"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Справді стерти обране зі зв’язку {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "Вилучити обраний ключ зі всіх об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "Вилучити параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "Додати нову пару ключ/значення до всіх об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "Правити значення обраного ключа для всіх об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "Параметри обраних об’єктів."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "Вибрати зв’язок"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "Вибрати зв’язок із основного виділення"
@@ -8943,5 +8948,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9597,5 +9602,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11995,13 +12000,13 @@
 msgstr "Отримання інформації про користувача…"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "Розширені налаштування"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Безпосереднє встановлення налаштувань. Використовуйте з обережністю!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -12009,18 +12014,29 @@
 msgstr "Пошук: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "Поточне значення є типовим"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Типове значення — ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr "Типове значення не відоме (параметр ще не використовувався)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "Будь ласка, оберіть рядок для вилучення."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "Введіть нову пару ключ/значення"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -12028,20 +12044,13 @@
 msgstr "Будь ласка, оберіть рядок для правки."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "Нове значення для {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "Будь ласка, оберіть рядок для вилучення."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "Введіть нову пару ключ/значення"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "Значення"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12628,5 +12637,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "Використовувати типові налаштування"
@@ -13127,5 +13136,10 @@
 "Отримано ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "Неможливо прочитати з джерела заготовок теґів: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -13137,10 +13151,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr "Неможливо прочитати з джерела заготовок теґів {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -13153,5 +13167,5 @@
 "width=600>Помилки: [{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -13163,5 +13177,5 @@
 "{3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -13173,5 +13187,5 @@
 "width=600>Помилка: {1}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -13183,9 +13197,9 @@
 "table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "Сортувати меню заготовок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "Заготовки теґів"
@@ -15227,5 +15241,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "немає опису"
@@ -15244,5 +15258,10 @@
 msgstr "Файл втулка ''{0}'' не містить Manifest."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "Детальніше…"
@@ -15693,5 +15712,5 @@
 "''{0}''. Використовую типовий код — ''en''."
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -15799,4 +15818,28 @@
 "налаштувань."
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "Змінити параметри"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "Імпорт зображень"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "Захопити не прив’язане до координат зображення"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "Помилка під час створення резервної копії вилучаємого шару : {0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -16169,4 +16212,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr "Вирівнювання ліній"
@@ -16189,5 +16233,5 @@
 msgstr "Вирівнювання може призвести до розміщення точки за межами світу.\n"
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr "Я готовий!"
@@ -16195,5 +16239,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr "Підказки AlignWays"
@@ -16770,8 +16814,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "вода"
@@ -16832,6 +16876,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "адреса"
@@ -17333,6 +17377,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "Порожній шар"
@@ -17554,6 +17598,15 @@
 msgstr "Не знайдено шару даних GPX"
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "Зовнішні інструменти"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+#, fuzzy
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr "Сценарій-нащадок повернув непридатні дані."
 
@@ -17576,5 +17629,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr "Використовувати зовнішні сценарії в JOSM"
@@ -18306,5 +18359,5 @@
 msgstr "Ви повинні виділити, як мінімум, дві лінії."
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -19097,4 +19150,9 @@
 msgid "Enter weight values"
 msgstr "Введіть обмеження ваги"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Нове значення для {0}"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
@@ -21146,5 +21204,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "ділянка"
@@ -21285,140 +21343,146 @@
 msgstr "{0}, …"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "{0} {1}% трека GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr "Показати поточне положення у відео-фрагменті"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr "Імпортувати відео"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr "Синхронізувати відео з цим треком GPS"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr "Вилучити відео"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr "вилучити поточне відео із шару"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
-msgstr "грати/пауза"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
+msgstr "Відтворення/пауза"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr "починає/зупиняє відтворення відео"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
 msgstr "назад"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr "перемотати на n сек назад"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr "перейти"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "Перемотати вперед"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr "перейти до введеного часу gps"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr "будь ласка, введіть GPS-час"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
-msgstr "вперед"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
+msgstr "Вперед"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr "перемотати на n сек вперед"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
-msgstr "швидше"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
+msgstr "Швидше"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr "пришвидшене відтворення"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr "повільніше"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "Повільніше"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr "повільне відтворення"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+#, fuzzy
+msgid "Loop"
 msgstr "по кругу"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr "зациклювати n сек біля поточної позиції"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr "Утримувати в центрі"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr "слідкувати за відео-позначкою автоматично"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr "Субтитри"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr "Показувати субтитри у відео"
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr "довжина переходу"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 msgid "Set the length of a jump"
 msgstr "Встановити довжину переходу"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr "переміщатись по відео на х мсек"
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr "Довжина циклу"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr "Встановити довжину циклу біля точки зациклювання"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr "без деінтерленсінгу"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr "деінтерленсінг з подвоєнням ліній"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr "деінтерленсінгу з лінійною інтерполяцією"
@@ -21436,4 +21500,8 @@
 msgid "play"
 msgstr "відтворити"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
+msgstr "по кругу"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
@@ -21543,6 +21611,12 @@
 msgstr "Точка ''{0}'' це з’єднання більше 2 ліній, що перетинаються."
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "Введіть текст для пошуку"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr "Виберіть маршрутну точку для переміщення мапи"
@@ -21571,5 +21645,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "Назва меню"
@@ -21580,6 +21654,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr "Отримати шари"
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Спортивні споруди"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21612,5 +21687,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "Посилання на WMS"
@@ -21750,5 +21825,5 @@
 "Це може призвести до помилкових координат."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21757,19 +21832,19 @@
 "спотворене"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr "(відключено)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Автоматичне завантаження шару WMS ({0}), в масштабі {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Завантаження шару WMS ({0}), в масштабі {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -21784,17 +21859,17 @@
 "в будь-якому випадку?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "Так, отримати зображення"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "Невірний URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "Завантажити видимі квадрати мапи"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21803,63 +21878,63 @@
 "змініть розподільчу здатність"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "Змінити розподільчу здатність"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "Перезавантажити помилкові квадрати"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "Альфа-канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "Зберегти шар WMS у файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "Зберегти шар WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "Завантажити шар WMS з файлу"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "Завантажити шар WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Непідтримувана версія файлу WMS; знайдено {0}, очікувалось {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "Помилка формату файлу"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Помилка завантаження файлу"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "Встановити закладку WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "Автоматичне завантаження"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr "Неможливо ініціалізувати дистанційне керування."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr "Втулок дистанційного керування не сумісний із {0}."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -21871,5 +21946,5 @@
 "Вам треба оновити втулки."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -21882,69 +21957,75 @@
 "Якщо оновлення втулків не допомогло надішліть звіт про \"{0}\"."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr "{0}: Проблеми з дистанційним керуванням"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Відкрити порожній шар WMS завантаження даних з файлу"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "Налаштування втулку WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Змінити список серверів WMS, які показуються в меню втулка WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr "Додати WMS-посилання"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "Копіювати виділені типові налаштування"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "Будь ласка, виберіть принаймні один рядок для копіювання."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "Завантажувач:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "Зміщення квадратів мапи"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "% на схід:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "% на північ:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr "Одночасних з’єднань"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr "Дозволити дистанційне керування (потрібен втулок remotecontrol)"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "Масштаб"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "Назва пункта меню (типова)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "Посилання на WMS (типове)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr "Додати WMS-посилання"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "Копіювати виділені типові налаштування"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "Будь ласка, виберіть принаймні один рядок для копіювання."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "Завантажувач:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "Зміщення квадратів мапи"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "% на схід:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "% на північ:"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr "Одночасних з’єднань"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr "Дозволити дистанційне керування (потрібен втулок remotecontrol)"
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
@@ -21953,4 +22034,9 @@
 "До Remote Control надійшов запит на завантаження WMS-шару із наступного "
 "посилання:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "Вилучити"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -22019,5 +22105,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "лісовий масив"
@@ -22311,6 +22397,12 @@
 msgstr "Насиченість:"
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -22322,15 +22414,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr "Інструменти для креслення будівель."
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr "Спеціальний обробник для сервера WMS французького земельного кадастру."
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -22347,10 +22439,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "Створити сітку з ліній."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -22359,10 +22451,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Дозволяє імпортувати файли різних форматів безпосередньо в JOSM"
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -22373,15 +22465,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr "Завантаження даних OSM вздовж лінії"
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "Дублювати лінії зі зміщенням"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -22392,5 +22484,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
@@ -22399,15 +22491,15 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr "Показує інформацію про маршрут у вигляді маршрутної діаграми."
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "Впроваджує шар тла, якій показує сітку на мапі"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -22420,15 +22512,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr "Допомагає у вірівнюванні тла зі супутниковими знімками від IRS."
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "Допомагає оцифровувати (векторизувати) зображення WMS."
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -22438,5 +22530,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -22449,15 +22541,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "Додає заборону повороту ліворуч для наборів з 4 або 5 ліній"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr "Легко перетворює ділянку у мультиполігон."
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -22468,5 +22560,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -22479,20 +22571,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr "Розширені параметри для редагування opening_hours"
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "Показує тло OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Імпорт питань з OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -22502,5 +22594,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -22508,5 +22600,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -22517,5 +22609,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -22526,10 +22618,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Чудовий JGoodies Пластиковий Скін."
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -22538,15 +22630,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "Дозволяє іншим застосункам посилати команди JOSM."
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr "Втулок для відміни наборів змін"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -22559,5 +22651,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -22568,10 +22660,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "Надає можливості маршрутизації."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -22583,5 +22675,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -22591,16 +22683,32 @@
 "у якості тла та надсилати запити на її оновлення."
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+#, fuzzy
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr "Для створення та редагування навігаційних знаків для OpenSeaMap"
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "Інформація про втулок"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Дозволяє додавати мітки/точки в поточній позиції GPS ."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Показує вікно для редагування теґів в табличному вигляді."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -22613,15 +22721,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "Зробити ряд будинків по вулиці з одного блоку."
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr "Для створення та редагування навігаційних знаків для OpenSeaMap"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22633,5 +22741,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22642,5 +22750,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22651,10 +22759,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr "Дозволяє відновлювати об’єкти, вилучені з бази даних OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22665,5 +22773,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22676,5 +22784,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22685,20 +22793,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Просте завантаження уздовж довгого набору взаємопов’язаних шляхів"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr "Дозволяє пошук маршрутних точок імпортованих із файлу gpx."
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Виділити послідовність з’єднаних ліній, що не розгалужуються"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22709,5 +22817,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -23603,4 +23711,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -23608,5 +23760,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "Круг"
@@ -24113,5 +24265,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "місцевого значення"
@@ -24160,5 +24312,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "службова"
@@ -24191,6 +24343,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "будується"
@@ -25349,5 +25501,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "болото з відкритою водою"
@@ -25545,7 +25697,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "велосипедний"
@@ -25821,8 +25973,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "рейка"
@@ -27258,5 +27410,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "термінал"
@@ -28529,32 +28681,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "спорт"
@@ -30351,9 +30537,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "зелений"
@@ -32016,5 +32202,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "метро"
@@ -32295,5 +32481,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32311,5 +32497,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "застарілий"
@@ -32686,7 +32872,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "траса"
@@ -32778,9 +32964,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "послуги"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -32790,5 +32984,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "брід"
@@ -32807,7 +33001,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "траса"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "коло для розвороту"
@@ -32822,5 +33029,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr "пункт першої допомоги"
@@ -32834,5 +33041,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "берег ріки"
@@ -32846,5 +33053,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "струмок"
@@ -32858,5 +33065,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "док"
@@ -33060,14 +33267,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "штучний"
@@ -33081,5 +33288,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr "пороги"
@@ -33141,7 +33348,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "точка залізниці"
@@ -33164,10 +33371,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "інша колія"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr "колія зверху"
@@ -33201,7 +33408,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "стара колія"
@@ -33246,6 +33453,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "авіатраса"
@@ -33267,5 +33474,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr "Завантажена авіатраса"
@@ -33279,5 +33486,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr "Помірно завантажена авіатраса"
@@ -33355,8 +33562,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr "канатна дорога"
@@ -33372,5 +33579,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr "легка лижня"
@@ -33384,5 +33591,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr "нормальна лижня"
@@ -33396,5 +33603,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr "ускладнена лижня"
@@ -33408,5 +33615,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr "складна лижня"
@@ -33420,5 +33627,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr "дуже складня лижня"
@@ -33432,5 +33639,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr "лижня для новачків"
@@ -33550,11 +33757,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "енергія"
@@ -33567,5 +33774,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "пірс"
@@ -33579,5 +33786,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "трубопровід"
@@ -33721,13 +33928,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "розваги"
@@ -33741,5 +33948,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "гавань"
@@ -33835,10 +34042,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr "зручності"
@@ -33948,11 +34155,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr "зручності пересування"
@@ -34390,24 +34597,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "зручності прості"
@@ -34439,6 +34646,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "легка вода"
@@ -34499,8 +34706,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "медицина"
@@ -34861,26 +35068,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "магазин"
@@ -34952,8 +35159,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "готель"
@@ -35053,9 +35260,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "туристичний"
@@ -35143,9 +35350,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "історичний"
@@ -35158,5 +35365,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "кар’єр"
@@ -35170,5 +35377,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "звалище"
@@ -35190,5 +35397,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "водойма"
@@ -35202,5 +35409,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "двір ферми"
@@ -35223,5 +35430,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "роздрібна торгівля"
@@ -35235,5 +35442,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "промисловість"
@@ -35247,5 +35454,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "очищене місце під забудову"
@@ -35259,5 +35466,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "місце під нову забудову"
@@ -35271,5 +35478,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "територія залізниці"
@@ -35326,7 +35533,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "військовий"
@@ -35340,5 +35547,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "кладовище"
@@ -35351,5 +35558,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "гірська вершина"
@@ -35364,5 +35571,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "льодовик"
@@ -35376,5 +35583,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "вулкан"
@@ -35428,8 +35635,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "довкілля"
@@ -35443,5 +35650,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "чагарник"
@@ -35455,5 +35662,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "верес"
@@ -35467,5 +35674,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "ліс"
@@ -35479,5 +35686,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "грязь"
@@ -35491,5 +35698,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "пляж"
@@ -35567,8 +35774,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "маршрут"
@@ -35657,12 +35864,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "кордон"
@@ -35812,11 +36019,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "місцевість"
@@ -35830,5 +36037,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr "дані TIGER"
@@ -36196,4 +36403,60 @@
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 — Італія"
+
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "Тільки дві ділянки можуть бути зараз об’єднані"
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "Приєднана ділянка, що перекриває сама себе"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "Введіть значення для всіх конфліктів."
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "Розв’язати конфлікти"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "Об’єднати ділянки: вилучити короткі лінії"
+
+#~ msgid "Closed Way"
+#~ msgstr "Замкнена лінія"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr "Помилка: Неочікуванний рядок ''{0}'' у переліку закладок з сервера"
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr ""
+#~ "Помилка: Невірне подвійне значення ''{0}'' в рядку ''{1}'' в переліку "
+#~ "закладок з сервера"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Збій завантаження закладок з ''{0}'' у зв’язку з проблемами безпеки. "
+#~ "Помилка: {1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>Неможливо створити закладку.<br>{0}</html>"
+
+#~ msgid "play/pause"
+#~ msgstr "грати/пауза"
+
+#~ msgid "jump"
+#~ msgstr "перейти"
+
+#~ msgid "forward"
+#~ msgstr "вперед"
+
+#~ msgid "faster"
+#~ msgstr "швидше"
+
+#~ msgid "slower"
+#~ msgstr "повільніше"
+
+#~ msgid "Get Layers"
+#~ msgstr "Отримати шари"
 
 #~ msgid "Error: {0}"
Index: /applications/editors/josm/i18n/po/zh_CN.po
===================================================================
--- /applications/editors/josm/i18n/po/zh_CN.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/zh_CN.po	(revision 23252)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
 "PO-Revision-Date: 2010-09-06 00:08+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:55+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -82,6 +82,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -234,5 +234,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -254,5 +253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -274,7 +273,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -395,5 +395,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -420,4 +420,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -425,5 +426,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -458,5 +459,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "信息"
@@ -664,8 +665,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -677,5 +678,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "删除"
@@ -851,14 +852,14 @@
 msgstr "退出程序。"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "全屏视图"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "切换全屏视图"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "切换全屏视图"
@@ -901,26 +902,22 @@
 msgstr "显示 OSM 路径，节点或关系的对象信息。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "联接重叠的区域"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "联接彼此互相重叠的区域"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "请选择至少一个要连结的封闭路径。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "目前只能连接两个区域。"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "\"{0}\" 尚未封闭因此不能连结。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -930,5 +927,5 @@
 msgstr[0] "选取的路径有节点位于已下载的资料区域之外。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -936,37 +933,67 @@
 msgstr "这样可能会造成节点被意外的删除。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "您确定要继续吗？"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "如果不确定请放弃"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "找不到交叉点。没有东西变更。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "还原更改组合"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "正在删除重复的节点..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "在所有的交叉点加入节点"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "删除不属于内部多重多边形的一部分的路径"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "修正关系"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "已连结自我重叠的区域"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "已连结重叠的区域"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -974,33 +1001,22 @@
 msgstr "部分属于关系的一部分的路径被修改了。请检查是否造成错误。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "为所有冲突的项目输入值。"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "解决冲突"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "修正标签冲突"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "将路径 {0} 分割为 {1} 个部分"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "从关系中移除元件"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "连结区域:移除短路径"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "封闭的路径"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "移除内部路径的标签"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "连结区域功能"
@@ -1510,12 +1526,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1536,6 +1551,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1570,6 +1585,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "错误"
@@ -1601,5 +1616,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1708,5 +1723,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "关闭"
@@ -1732,5 +1747,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "否，中止"
@@ -1762,5 +1777,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1943,10 +1958,10 @@
 msgstr "分离节点"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "分离为 {0} 个节点"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2340,4 +2355,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2483,17 +2499,17 @@
 msgstr[0] "加入并移动虚拟新节点至{0}路径"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "移动元素"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "移动它们"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "取消移动"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2505,18 +2521,18 @@
 "真的要移动它们吗?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "放开鼠标按钮以选择矩形内的对象。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 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:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "放开鼠标按钮以停止旋转。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2995,4 +3011,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3373,5 +3390,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "新的数值"
@@ -3444,15 +3460,15 @@
 msgstr "不合法的经度数值 \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "警告：将偏好设定固定为 \"{0}\" 失败"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "设定文件第 {0} 行格式不良"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3461,5 +3477,5 @@
 msgstr "警告：初始化偏好设定失败。偏好设定目录 \"{0}\" 不是一个目录。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3469,5 +3485,5 @@
 "<html>初始化偏好设定失败。<br>偏好设定目录 \"{0}\" 不是一个目录。</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3476,5 +3492,5 @@
 msgstr "警告：初始化偏好设定失败。无法建立缺少的偏好设定目录：{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3483,5 +3499,5 @@
 msgstr "<html>初始化偏好设定失败。<br>无法建立缺少的偏好设定目录：{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3489,5 +3505,5 @@
 msgstr "警告：缺少偏好设定文件 \"{0}\"。正在建立预设的偏好设定文件。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3496,5 +3512,5 @@
 msgstr "警告：以预设的偏好设定文件取代现有的偏好设定文件 \"{0}\"。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3503,5 +3519,5 @@
 msgstr "<html>初始化偏好设定失败。<br>无法将偏好设定重设为预设值：{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3512,5 +3528,5 @@
 "偏好设定文件。</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3519,15 +3535,4 @@
 msgstr "警告：初始化偏好设定失败。无法将偏好设定重设为预设值：{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "错误：在书签文件 \"{1}\" 中有未预期的行 \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr "错误：书签文件 \"{2}\" 的 \"{1}\" 行有不合格的 double 数值 \"{0}\""
-
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
@@ -3543,23 +3548,4 @@
 msgid "Could not load preferences from server."
 msgstr "无法从服务器载入偏好设定。"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr "错误：服务器的书签清单中有未预期的行 \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr "错误：服务器的书签清单的 \"{1}\" 行有不合格的double 数值 \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr "基于安全性的理由无法从 \"{0}\" 载入书签。例外为：{1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -3966,13 +3952,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "建立缓存目录时发生错误：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "错误：在书签文件 \"{1}\" 中有未预期的行 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr "错误：书签文件 \"{2}\" 的 \"{1}\" 行有不合格的 double 数值 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr "<html>无法读取书签<br>\"{0}\"<br>错误为：{1}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>无法写入书签。<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4090,5 +4091,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "建筑"
@@ -4260,10 +4261,10 @@
 msgstr "如果指定，会重设组态而非读取它。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "用户名"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4437,8 +4438,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4661,5 +4662,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5186,9 +5187,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5201,9 +5202,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5289,5 +5289,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "无"
@@ -5583,5 +5583,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5682,11 +5682,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "加入"
@@ -6031,10 +6031,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "在关系清单中选择"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "在关系清单中选择。"
@@ -7702,9 +7702,9 @@
 msgstr "这个更改组合查询URL 是无效的"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "加入属性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7712,13 +7712,13 @@
 msgstr[0] "这会改变 {0} 个对象。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "空白的数值代表删除该标签。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7726,10 +7726,10 @@
 msgstr "<不同>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "是否改变数值?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7737,5 +7737,5 @@
 msgstr[0] "改变属性至 {0} 个对象"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7743,77 +7743,86 @@
 msgstr[0] "这会改变 {0} 个对象。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "请选择一个设定键"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "请选择一个数值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 msgid "Please select the objects you want to change properties for."
 msgstr "请选择您要改变属性的对象。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "属性/成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "选取对象的属性。"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr "位置"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "属性：{0} / 成员：{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "属性 / 成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "改变关系"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "自关系中删除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "确定要删除关系{0} 的选择区域?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "删除所有对象中选取的设定键"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "删除属性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "将新的设定键/数值配对加入到所有的对象"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "编辑所有对象选取设定键的数值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "选取对象的属性。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "选择关系"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "选择主要选择区域的关系。"
@@ -8553,5 +8562,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9168,5 +9177,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -11380,13 +11389,13 @@
 msgstr "正在取回用户信息..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "高级偏好设定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "直接设定偏好设定项目。请小心使用!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11394,18 +11403,29 @@
 msgstr "查找： "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "目前的数值是预设值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "预设值是 \"{0}\"。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr "预设数值目前不明(设定值尚未使用)。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "请选择要删除的列。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "输入新的设定键/数值配对"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11413,20 +11433,13 @@
 msgstr "请选择要编辑的列。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "{0} 的新数值"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "请选择要删除的列。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "输入新的设定键/数值配对"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "数值"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -11977,5 +11990,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "启用内建预设值"
@@ -12448,5 +12461,10 @@
 msgstr "警告：样式清单 \"{0}\" 中项目的格式不正确。得到 \"{1}\"。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "无法读取标签预设组合来源：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12458,10 +12476,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr "无法读取标签预设组合来源 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12473,5 +12491,5 @@
 "<br><br><table width=600>错误为： [{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12482,5 +12500,5 @@
 "width=400>错误为： [{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12491,5 +12509,5 @@
 "<br><br><table width=600>错误为：{1}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12500,9 +12518,9 @@
 "width=600>错误为：{1}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "排序预设组合菜单"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "加上预先组合标签"
@@ -14399,5 +14417,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "没有描述可用"
@@ -14414,5 +14432,10 @@
 msgstr "插件文件 \"{0}\" 没有包含 Manifest。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "更多信息..."
@@ -14834,5 +14857,5 @@
 "\"。"
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -14933,4 +14956,28 @@
 msgstr "偏好设定的设定键 \"{0}\" 不存在。不能从偏好设定中恢复窗口位置大小。"
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "改变属性"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "输入图片"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "抓取非地理参照的图片"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "创建删除图层的备份时发生错误：{0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15289,4 +15336,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr "对齐路径"
@@ -15307,5 +15355,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr "准备就绪!"
@@ -15313,5 +15361,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr "AlignWays 密诀"
@@ -15854,8 +15902,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "水域"
@@ -15916,6 +15964,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "住址"
@@ -16393,6 +16441,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "空白图层"
@@ -16614,6 +16662,14 @@
 msgstr "找不到 GPX 数据图层。"
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "外部工具"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr ""
 
@@ -16636,5 +16692,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr "在 JOSM 使用扩展脚本"
@@ -17345,5 +17401,5 @@
 msgstr "您必须选择至少两条路径。"
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -18122,4 +18178,9 @@
 msgstr "输入重量限制值"
 
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "{0} 的新数值"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
@@ -20101,5 +20162,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "区域"
@@ -20235,140 +20296,146 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr "显示目前在影片中的位置"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr "导入视频"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr "与 GPS 轨迹同步视频"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr "删除视频"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr "从图层中删除当前视频"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
 msgstr "播放/暂停"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr "开始/暂停播放视频"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
 msgstr "后退"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr "跳至后 n 秒"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "跳前"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
 msgstr "前进"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr "跳至前 n 秒"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
 msgstr "加速"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr "加速播放"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
 msgstr "减速"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr "减速播放"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+#, fuzzy
+msgid "Loop"
 msgstr "循环"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr ""
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20386,4 +20453,8 @@
 msgid "play"
 msgstr "播放"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
+msgstr "循环"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
@@ -20481,6 +20552,12 @@
 msgstr "节点 \"{0}\" 是一个有超过 2 条路径连接的交汇处。"
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "请输入查找词句"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20508,5 +20585,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "菜单名称"
@@ -20517,6 +20594,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "运动设施"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20547,5 +20625,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "WMS URL"
@@ -20679,24 +20757,24 @@
 "这可能会导致错误的坐标。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr "警告：WMS 图层已停用，因为基础 URL \"{0}\" 出现异常"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr "(不使用)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS 图层 ({0})，于缩放 {1} 自动下载"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS 图层 ({0})，于缩放 {1} 下载"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20710,80 +20788,80 @@
 "取回 WMS 拼贴?\""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "是，抓取图片"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "无效的 URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "下载可见的拼贴"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr "要求的区域太大。请拉近一点，或是改变解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "改变解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "重新载入错误的拼贴"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "透明色版"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "将 WMS 图层保存为文件"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "保存 WMS 图层"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "从文件载入 WMS 图层"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "载入 WMS 图层"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "不支持的 WMS 文件版本；发现 {0}，应为 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "文件格式错误"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "载入文件有错误"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "设定 WMS 书签"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "自动下载"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20792,5 +20870,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20800,73 +20878,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "开啓空白 WMS 图层以便自文件载入数据"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "WMS 插件偏好设定"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "修改在 WMS 插件菜单中显示的 WMS 服务器清单"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "复制已选取的预设值"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "请选择至少一列来复制。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "下载器："
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "重叠拼贴"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "% 东："
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "% 北："
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr "同时连接"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "缩放"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "菜单名称(预设值)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "WMS URL(预设值)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "复制已选取的预设值"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "请选择至少一列来复制。"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "下载器："
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "重叠拼贴"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "% 东："
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "% 北："
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr "同时连接"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "删除"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20931,5 +21020,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "森林"
@@ -21223,6 +21312,12 @@
 msgstr "彩度："
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -21232,15 +21327,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr "绘制建筑物的工具。"
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr "用于法国土地登记 WMS 服务器的特别处理程序。"
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -21255,10 +21350,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "建立路径的格线。"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -21266,10 +21361,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "允许直接将多种文件格式输入 JOSM。"
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21279,15 +21374,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr "沿着一条路径下载 OSM 数据"
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "重制路径并位移"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21296,20 +21391,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "在 JOSM 中直接从 Globalsat dg100 数据记录器下载 GPS 点。"
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr "以路线图显示视觉化路线信息"
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "提供显示地图格线的背景图层"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21321,15 +21416,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "帮助将 WMS 图片矢量化。"
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21337,5 +21432,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21347,15 +21442,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr "只把区域转换为多重多边形。"
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21364,5 +21459,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21374,20 +21469,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "显示 OpenLayers 背景图片"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "输入OpenStreetBugs 的议题"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21395,5 +21490,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21401,5 +21496,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21409,5 +21504,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21416,10 +21511,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "超棒的 JGoodies 塑胶外观与感觉。"
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21427,15 +21522,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "让其他的应用程序传送指令给 JOSM。"
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr "还原更改组合的插件"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21445,5 +21540,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21454,10 +21549,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "提供路线规画的功能。"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21466,5 +21561,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21473,16 +21568,31 @@
 "在 JOSM 中显示快速地图格线。可以从快速地图中载入拼贴作为背景并要求更新。"
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "插件信息"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "允许在目前的 gps 位置加入标记/节点。"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "提供在表格线中编辑标签的对话框。"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21494,15 +21604,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "让连栋房屋能超出单一区块。"
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21511,5 +21621,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21518,5 +21628,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21526,10 +21636,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr "允许从 OSM 数据库中取消对象的删除"
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21540,5 +21650,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21550,5 +21660,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21559,20 +21669,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "方便的下载一整组互相联结的路径"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21581,5 +21691,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22473,4 +22583,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22478,5 +22632,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "环岛"
@@ -22983,5 +23137,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "居住区道路"
@@ -23030,5 +23184,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "服务道路"
@@ -23061,6 +23215,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "施工"
@@ -24219,5 +24373,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr "沼泽(marsh)"
@@ -24415,7 +24569,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "单车"
@@ -24691,8 +24845,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "第三轨"
@@ -26128,5 +26282,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr "航站楼"
@@ -27399,32 +27553,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "运动"
@@ -29221,9 +29409,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "绿色"
@@ -30886,5 +31074,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "地铁"
@@ -31165,5 +31353,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31181,5 +31369,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "已废弃"
@@ -31556,7 +31744,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr "公路轨迹"
@@ -31648,9 +31836,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr "服务"
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31660,5 +31856,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr "浅滩"
@@ -31677,7 +31873,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "公路轨迹"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr "回转圈"
@@ -31692,5 +31901,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr "紧急连络点"
@@ -31704,5 +31913,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "河岸"
@@ -31716,5 +31925,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "溪流"
@@ -31728,5 +31937,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr "码头"
@@ -31930,14 +32139,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr "人造"
@@ -31951,5 +32160,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr "急流"
@@ -32011,7 +32220,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr "铁路点"
@@ -32034,10 +32243,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr "其他铁路"
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr ""
@@ -32071,7 +32280,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr "旧铁路"
@@ -32116,6 +32325,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr "机场"
@@ -32137,5 +32346,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr ""
@@ -32149,5 +32358,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr ""
@@ -32225,8 +32434,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr ""
@@ -32242,5 +32451,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr ""
@@ -32254,5 +32463,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr ""
@@ -32266,5 +32475,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr ""
@@ -32278,5 +32487,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr ""
@@ -32290,5 +32499,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr ""
@@ -32302,5 +32511,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr ""
@@ -32420,11 +32629,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr "塔"
@@ -32437,5 +32646,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr "码头"
@@ -32449,5 +32658,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr "管道"
@@ -32591,13 +32800,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr "休闲"
@@ -32611,5 +32820,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr "码头"
@@ -32705,10 +32914,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr ""
@@ -32818,11 +33027,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr ""
@@ -33260,24 +33469,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr "景观灯"
@@ -33309,6 +33518,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr "自来水"
@@ -33369,8 +33578,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr "医疗"
@@ -33731,26 +33940,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr "商店"
@@ -33822,8 +34031,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "旅馆"
@@ -33923,9 +34132,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr "旅游"
@@ -34013,9 +34222,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr "古迹"
@@ -34028,5 +34237,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr "采石场"
@@ -34040,5 +34249,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr "垃圾填埋场"
@@ -34060,5 +34269,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr "水池"
@@ -34072,5 +34281,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr "农家庭院"
@@ -34093,5 +34302,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr "零售"
@@ -34105,5 +34314,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr "产业"
@@ -34117,5 +34326,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr "棕色地带 (待重新开发的城市用地)"
@@ -34129,5 +34338,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr "绿地"
@@ -34141,5 +34350,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr "铁路用地"
@@ -34196,7 +34405,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "军事"
@@ -34210,5 +34419,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr "墓地(不靠近教堂)"
@@ -34221,5 +34430,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr "山峰"
@@ -34234,5 +34443,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr "冰川"
@@ -34246,5 +34455,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "火山"
@@ -34298,8 +34507,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr "自然"
@@ -34313,5 +34522,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr "灌木丛"
@@ -34325,5 +34534,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr "荒野"
@@ -34337,5 +34546,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "树林区"
@@ -34349,5 +34558,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr "泥沼"
@@ -34361,5 +34570,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "海滩"
@@ -34437,8 +34646,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "路线"
@@ -34527,12 +34736,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "边界"
@@ -34682,11 +34891,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr "地点"
@@ -34700,5 +34909,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -35066,4 +35275,50 @@
 msgid "PCN 2006 - Italy"
 msgstr ""
+
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "目前只能连接两个区域。"
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "已连结自我重叠的区域"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "为所有冲突的项目输入值。"
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "解决冲突"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "连结区域:移除短路径"
+
+#~ msgid "Closed Way"
+#~ msgstr "封闭的路径"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr "错误：服务器的书签清单中有未预期的行 \"{0}\""
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr "错误：服务器的书签清单的 \"{1}\" 行有不合格的double 数值 \"{0}\""
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr "基于安全性的理由无法从 \"{0}\" 载入书签。例外为：{1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>无法写入书签。<br>{0}</html>"
+
+#~ msgid "play/pause"
+#~ msgstr "播放/暂停"
+
+#~ msgid "forward"
+#~ msgstr "前进"
+
+#~ msgid "faster"
+#~ msgstr "加速"
+
+#~ msgid "slower"
+#~ msgstr "减速"
 
 #~ msgid "The selected way does not contain the selected node."
Index: /applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- /applications/editors/josm/i18n/po/zh_TW.po	(revision 23251)
+++ /applications/editors/josm/i18n/po/zh_TW.po	(revision 23252)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 23:09+0200\n"
-"PO-Revision-Date: 2010-09-06 00:30+0000\n"
+"POT-Creation-Date: 2010-09-18 15:45+0200\n"
+"PO-Revision-Date: 2010-09-17 17:31+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Traditional Chinese\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-09-10 20:55+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 11:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
@@ -83,6 +83,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
@@ -235,5 +235,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -255,5 +254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -275,7 +274,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:990
@@ -396,5 +396,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
@@ -421,4 +421,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:27
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -426,5 +427,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:212
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -459,5 +460,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
 msgid "Information"
 msgstr "資訊"
@@ -665,8 +666,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1045
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -678,5 +679,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Delete"
 msgstr "刪除"
@@ -852,14 +853,14 @@
 msgstr "離開程式"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:31
 msgid "Fullscreen View"
 msgstr "全螢幕檢視"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle fullscreen view"
 msgstr "切換全螢幕檢視"
 
-#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:34
 msgid "Toggle Fullscreen view"
 msgstr "切換全螢幕檢視"
@@ -902,26 +903,22 @@
 msgstr "顯示 OSM 路徑、節點或關係的物件資訊。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Join overlapping Areas"
 msgstr "連結重疊的區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:339
 msgid "Joins areas that overlap each other"
 msgstr "連接彼此互相重疊的區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:351
 msgid "Please select at least one closed way that should be joined."
 msgstr "請選擇至少一個要連結的封閉路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:177
-msgid "Only up to two areas can be joined at the moment."
-msgstr "目前只能連結兩個區域。"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:358
 #, java-format
 msgid "\"{0}\" is not closed and therefore cannot be joined."
 msgstr "「{0}」尚未封閉因此不能連結。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:371
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
@@ -931,5 +928,5 @@
 msgstr[0] "選取的路徑有節點位於已下載資料區域之外。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
@@ -937,37 +934,67 @@
 msgstr "這樣可能會造成節點被意外的刪除。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
 msgid "Are you really sure to continue?"
 msgstr "您確定要繼續嗎？"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:376
 msgid "Please abort if you are not sure"
 msgstr "如果不確定請放棄"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:411
 msgid "No intersection found. Nothing was changed."
 msgstr "找不到交叉點。沒有東西變更。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:263
+#. revert changes
+#. FIXME: this is dirty hack
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:417
+#, fuzzy
+msgid "Reverting changes"
+msgstr "還原變更組合"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:465
+msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:475
+msgid ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:487
+msgid ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:492
+msgid ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:567
+#, fuzzy
+msgid "Removed duplicate nodes"
+msgstr "正在移除重複的節點..."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:575
 msgid "Added node on all intersections"
 msgstr "在所有的交叉點加入節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:620
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "刪除不屬於內部多重多邊形一部分的路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:629
 msgid "Fix relations"
 msgstr "修正關係"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:301
-msgid "Joined self-overlapping area"
-msgstr "已連結自我重疊的區域"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:636
 msgid "Joined overlapping areas"
 msgstr "已連結重疊的區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:639
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -975,33 +1002,22 @@
 msgstr "部分屬於關係的一部分的路徑被修改了。請檢查是否造成錯誤。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:374
-msgid "Enter values for all conflicts."
-msgstr "輸入所有衝突項目的數值。"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:375
-msgid "Solve Conflicts"
-msgstr "解決衝突"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:690
 msgid "Fix tag conflicts"
 msgstr "修正標籤的衝突"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:551
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1205
+#, fuzzy
+msgid "Split ways into fragments"
+msgstr "分割路徑區段"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1694
 msgid "Removed Element from Relations"
 msgstr "從關係中移除元件"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:867
-msgid "Join Areas: Remove Short Ways"
-msgstr "連結區域：移除短路徑"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:887
-msgid "Closed Way"
-msgstr "封閉的路徑"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1224
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1784
 msgid "Remove tags from inner ways"
 msgstr "移除內部路徑的標籤"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1816
 msgid "Join Areas Function"
 msgstr "連結區域功能"
@@ -1439,18 +1455,18 @@
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
 msgid "Purge..."
-msgstr ""
+msgstr "清除..."
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
 msgid "Forget objects but do not delete them on server when uploading."
-msgstr ""
+msgstr "忘掉物件但是在上傳時不要將它們從伺服器上刪除。"
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Purge"
-msgstr ""
+msgstr "清除"
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:166
 msgid "Confirm Purging"
-msgstr ""
+msgstr "確認清除"
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:191
@@ -1460,4 +1476,6 @@
 "uploading."
 msgstr ""
+"這個操作會讓 JOSM 忘掉選取的物件。<br>它們會從圖層中移除，但是<i>不會</i>在上"
+"傳時<br>刪除伺服器上的物件。"
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:199
@@ -1465,9 +1483,9 @@
 "The following dependent objects will be purged<br> in addition to the "
 "selected objects:"
-msgstr ""
+msgstr "下列相依的物件會與選取的物件<br>一起被清除："
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:230
 msgid "Add to selection"
-msgstr ""
+msgstr "加入至選擇區域"
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:244
@@ -1475,5 +1493,5 @@
 "Some of the objects are modified.<br> Proceed, if these changes should be "
 "discarded.</html>"
-msgstr ""
+msgstr "部分物件已修改。<br>如果這些變更是要放棄的，請繼續。</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:250
@@ -1509,12 +1527,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:468
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:479
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:515
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:399
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:410
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:433
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:446
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
@@ -1535,6 +1552,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:210
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
@@ -1569,6 +1586,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:534
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:684
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "錯誤"
@@ -1576,5 +1593,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:54
 msgid "Reverse way"
-msgstr ""
+msgstr "反轉路徑"
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:67
@@ -1600,5 +1617,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1351
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1359
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1707,5 +1724,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1327
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1335
 msgid "Close"
 msgstr "關閉"
@@ -1731,5 +1748,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
 msgid "No, abort"
 msgstr "否，中止"
@@ -1761,5 +1778,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
 #: build/specialmessages.java:88
@@ -1810,5 +1827,5 @@
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr ""
+msgstr "目前的選擇區域不能用於分割 - 尚未選取節點。"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -1942,10 +1959,10 @@
 msgstr "取消黏合節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "分離為 {0} 個節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2339,4 +2356,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:101
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -2482,17 +2500,17 @@
 msgstr[0] "加入並移動虛擬新節點至{0}路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:457
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
 msgid "Move elements"
 msgstr "移動元素"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Move them"
 msgstr "移動它們"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:458
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:475
 msgid "Undo move"
 msgstr "取消移動"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
 #, java-format
 msgid ""
@@ -2504,18 +2522,18 @@
 "真的要移動它們嗎？"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:606
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "放開滑鼠按鈕以選擇矩形內的物件。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:608
 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:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:610
 msgid "Release the mouse button to stop rotating."
 msgstr "放開滑鼠按鈕以停止旋轉。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:612
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2996,4 +3014,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:288
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -3372,5 +3391,4 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "新的數值"
@@ -3443,15 +3461,15 @@
 msgstr "不合法的經度數值「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:347
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:278
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "警告：將偏好設定固定為「{0}」失敗"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:383
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "設定檔案第 {0} 行格式不良"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:395
 #, java-format
 msgid ""
@@ -3460,5 +3478,5 @@
 msgstr "警告：初始化偏好設定失敗。偏好設定目錄「{0}」不是一個目錄。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:467
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:398
 #, java-format
 msgid ""
@@ -3467,5 +3485,5 @@
 msgstr "<html>初始化偏好設定失敗。<br>偏好設定目錄「{0}」不是一個目錄。</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3474,5 +3492,5 @@
 msgstr "警告：初始化偏好設定失敗。無法建立缺少的偏好設定目錄：{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:409
 #, java-format
 msgid ""
@@ -3481,5 +3499,5 @@
 msgstr "<html>初始化偏好設定失敗。<br>無法建立缺少的偏好設定目錄：{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:420
 #, java-format
 msgid ""
@@ -3487,5 +3505,5 @@
 msgstr "警告：缺少偏好設定檔案「{0}」。正在建立預設的偏好設定檔案。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:493
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:424
 #, java-format
 msgid ""
@@ -3494,5 +3512,5 @@
 msgstr "警告：以預設的偏好設定檔案取代現有的偏好設定檔案「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3501,5 +3519,5 @@
 msgstr "<html>初始化偏好設定失敗。<br>無法將偏好設定重設為預設值：{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:514
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:445
 #, java-format
 msgid ""
@@ -3510,5 +3528,5 @@
 "偏好設定檔案。</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:524
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
 #, java-format
 msgid ""
@@ -3517,15 +3535,4 @@
 msgstr "警告：初始化偏好設定失敗。無法將偏好設定重設為預設值：{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:551
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "錯誤：在書籤檔案「{1}」中有未預期的行「{0}」"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:561
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr "錯誤：書籤檔「{2}」的「{1}」行有不合格的 double 數值「{0}」"
-
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
@@ -3541,23 +3548,4 @@
 msgid "Could not load preferences from server."
 msgstr "無法從伺服器載入偏好設定。"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
-#, java-format
-msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr "錯誤：伺服器的書籤清單中有未預期的行「{0}」"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
-#, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr "錯誤：伺服器的書籤清單的「{1}」行有不合格的 double 數值「{0}」"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr "基於安全性的理由無法從「{0}」載入書籤。例外為：{1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -3664,5 +3652,5 @@
 "Object of type {0} with id {1} was marked to be deleted, but it's missing in "
 "the source dataset"
-msgstr ""
+msgstr "類型 {0} id 為 {1} 的物件已標記為刪除，但是在原始資料組合中 卻找不到"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
@@ -3693,5 +3681,5 @@
 #, java-format
 msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
-msgstr ""
+msgstr "類型 {0} id 為 {1} 的物件在「visible」屬性中有衝突"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -3934,17 +3922,17 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
 msgid "Offset 3.000.000m east"
-msgstr ""
+msgstr "東移 3.000.000m"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
 msgid "Guadeloupe Fort-Marigot 1949"
-msgstr ""
+msgstr "Guadeloupe Fort-Marigot 1949"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
 msgid "Guadeloupe Ste-Anne 1948"
-msgstr ""
+msgstr "Guadeloupe Ste-Anne 1948"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
 msgid "Martinique Fort Desaix 1952"
-msgstr ""
+msgstr "Martinique Fort Desaix 1952"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
@@ -3954,9 +3942,9 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
 msgid "Guyane RGFG95"
-msgstr ""
+msgstr "Guyane RGFG95"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:405
 msgid "UTM France (DOM)"
-msgstr ""
+msgstr "UTM 法國 (DOM)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:417
@@ -3964,13 +3952,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52
+#, fuzzy
+msgid "Wrong number of arguments for bookmark"
+msgstr "給 nodes 運算子錯誤的參數數量。"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116
+#, fuzzy
+msgid "Error reading bookmark entry: %s"
+msgstr "建立快取目錄時發生錯誤：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:136
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "錯誤：在書籤檔案「{1}」中有未預期的行「{0}」"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr "錯誤：書籤檔「{2}」的「{1}」行有不合格的 double 數值「{0}」"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:166
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr "<html>無法讀取書籤<br>''{0}''<br>錯誤為：{1}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr "<html>無法寫入書籤。<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -4088,5 +4092,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4397
+#: build/trans_style.java:4490
 msgid "building"
 msgstr "建築"
@@ -4259,10 +4263,10 @@
 msgstr "如果指定，會重設組態而非讀取它。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:97
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "使用者名稱"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:100
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
@@ -4401,10 +4405,9 @@
 msgid "JOSM found {0} unsaved osm data layer. "
 msgid_plural "JOSM found {0} unsaved osm data layers. "
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "JOSM 發現 {0} 個未儲存的 osm 資料圖層。 "
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
-msgstr ""
+msgstr "看來 JOSM 上次似乎是當機了。您想要還原資料嗎？"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:299
@@ -4420,4 +4423,7 @@
 "version of JOSM.</li></ul>More Info:"
 msgstr ""
+"<h2>JOSM 需要 Java version 6。</h2>偵測到的 Java 版本：{0}。<br>您可以 "
+"<ul><li>更新您的 Java (JRE) 或是</li><li>使用較舊的 (Java 5 相容的)  JOSM 版"
+"本。</li></ul>更多資訊："
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:327
@@ -4435,8 +4441,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
@@ -4574,13 +4580,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:762
 msgid "Metric"
-msgstr ""
+msgstr "公制"
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:763
 msgid "Chinese"
-msgstr ""
+msgstr "中式"
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:764
 msgid "Imperial"
-msgstr ""
+msgstr "英制"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -4659,5 +4665,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/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -5187,9 +5193,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:273
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
@@ -5202,9 +5208,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:545
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
@@ -5290,5 +5295,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "none"
 msgstr "沒有"
@@ -5584,5 +5589,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5684,11 +5689,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:982
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "Add"
 msgstr "加入"
@@ -6033,10 +6038,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1149
 msgid "Select in relation list"
 msgstr "在關係清單中選擇"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1150
 msgid "Select relation in relation list."
 msgstr "在關係清單中選擇。"
@@ -7704,9 +7709,9 @@
 msgstr "這個變更組合查詢 URL 是無效的"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 msgid "Add Properties"
 msgstr "加入屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:201
 #, java-format
 msgid "This will change {0} object."
@@ -7714,13 +7719,13 @@
 msgstr[0] "這會改變 {0} 個物件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:203
 msgid "An empty value deletes the tag."
 msgstr "空白的數值代表刪除該標籤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:553
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7728,10 +7733,10 @@
 msgstr "<不同>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:408
 msgid "Change values?"
 msgstr "是否改變數值？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7739,5 +7744,5 @@
 msgstr[0] "改變屬性至 {0} 個物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 #, java-format
 msgid "This will change up to {0} object."
@@ -7745,77 +7750,86 @@
 msgstr[0] "這會改變 {0} 個物件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:368
 msgid "Please select a key"
 msgstr "請選擇一個設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Please select a value"
 msgstr "請選擇一個數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:489
 msgid "Please select the objects you want to change properties for."
 msgstr "請選擇您要改變屬性的物件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 msgid "Properties/Memberships"
 msgstr "屬性/成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:540
 msgid "Properties for selected objects."
 msgstr "選取物件的屬性。"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Member Of"
 msgstr "成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
 msgid "Position"
 msgstr "位置"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "屬性：{0} / 成員：{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
 msgid "Properties / Memberships"
 msgstr "屬性 / 成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
 msgid "Change relation"
 msgstr "改變關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
 msgid "Delete from relation"
 msgstr "自關係中刪除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "確定要刪除關係 {0} 的選擇區域？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Delete the selected key in all objects"
 msgstr "刪除所有物件中選取的設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
 msgid "Delete Properties"
 msgstr "删除屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 msgid "Add a new key/value pair to all objects"
 msgstr "將新的設定鍵/數值配對加入到所有的物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Edit the value of the selected key for all objects"
 msgstr "編輯所有物件選取設定鍵的數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+msgid "Go to OSM wiki for tag help (F1)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#, fuzzy
+msgid "Launch browser with wiki help to selected object"
+msgstr "選取物件的屬性。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
 msgid "Select relation"
 msgstr "選擇關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1146
 msgid "Select relation in main selection."
 msgstr "選擇主要選擇區域的關係。"
@@ -8555,5 +8569,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:190
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:176
 #: build/trans_presets.java:386 build/trans_presets.java:387
 #: build/trans_presets.java:388 build/trans_presets.java:389
@@ -9170,5 +9184,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: build/specialmessages.java:89
 msgid "No"
@@ -9506,9 +9520,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
 msgid "Cancel and return to the previous dialog"
-msgstr ""
+msgstr "取消並返回前一個對話盒"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
 msgid "Ignore this hint and upload anyway"
-msgstr ""
+msgstr "忽略這個提示並強制上傳"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
@@ -11373,13 +11387,13 @@
 msgstr "正在取回使用者資訊..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
 msgid "Advanced Preferences"
 msgstr "進階的偏好設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "直接設定偏好設定項目。請小心使用！"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
@@ -11387,18 +11401,29 @@
 msgstr "搜尋： "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 msgid "Current value is default."
 msgstr "目前的數值是預設值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "預設值是「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:108
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr "預設數值目前不明（設定值尚未使用）。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:105
+msgid "Please select the row to delete."
+msgstr "請選擇要刪除的列。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+msgid "Enter a new key/value pair"
+msgstr "輸入新的設定鍵/數值配對"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:250
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
@@ -11406,20 +11431,13 @@
 msgstr "請選擇要編輯的列。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
-#, java-format
-msgid "New value for {0}"
-msgstr "{0} 的新數值"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
-msgid "Please select the row to delete."
-msgstr "請選擇要刪除的列。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
-msgid "Enter a new key/value pair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
+#, fuzzy
+msgid "Change a key/value pair"
 msgstr "輸入新的設定鍵/數值配對"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
+#, fuzzy
+msgid "Values"
+msgstr "數值"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -11532,5 +11550,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
 msgid "Auto save interval (seconds)"
-msgstr ""
+msgstr "自動儲存間隔 (秒鐘)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
@@ -11542,5 +11560,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
 msgid "Auto saved files per layer"
-msgstr ""
+msgstr "每個圖層自動儲存的檔案"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
@@ -11550,4 +11568,6 @@
 "tries to recover the unsaved changes on next start.)</i>"
 msgstr ""
+"<i>(自動儲存會儲存每個時間間隔後變更的資料圖層。備份會儲存在 JOSM 的偏好設定"
+"資料夾。發生當機後，JOSM 會在下次啟動時嘗試還原未儲存的變更。)</i>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
@@ -11564,4 +11584,6 @@
 "the file name and saves it in the same folder.)</i>"
 msgstr ""
+"<i>(JOSM 會在儲存資料圖層時保留備份檔案。它會在檔案名稱後加上 ''~'' 並將它儲"
+"存在同一個資料夾。)</i>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
@@ -11774,5 +11796,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr ""
+msgstr "自動"
 
 #. gpx data field name
@@ -11780,5 +11802,5 @@
 msgctxt "gpx_field"
 msgid "Name"
-msgstr ""
+msgstr "名稱"
 
 #. gpx data field name
@@ -11786,9 +11808,9 @@
 msgctxt "gpx_field"
 msgid "Desc(ription)"
-msgstr ""
+msgstr "描述"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr ""
+msgstr "兩者"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
@@ -11877,9 +11899,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
-msgstr ""
+msgstr "允許改變軌跡航點的標籤。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr ""
+msgstr "航點標籤"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
@@ -11968,5 +11990,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:138
 msgid "Enable built-in defaults"
 msgstr "啟用內建預設值"
@@ -12285,5 +12307,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
 msgid "System of measurement"
-msgstr ""
+msgstr "測量的系統"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -12427,5 +12449,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
 msgid "Internal style"
-msgstr ""
+msgstr "內部樣式"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
@@ -12439,5 +12461,10 @@
 msgstr "警告：樣式清單「{0}」中項目的格式不正確。得到「{1}」。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60
+#, fuzzy, java-format
+msgid "Warning: Could not read tagging preset source: {0}"
+msgstr "無法讀取標籤預設組合來源：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
 #, java-format
 msgid ""
@@ -12449,10 +12476,10 @@
 
 #. Should not happen, but at least show message
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
 #, java-format
 msgid "Could not read tagging preset source {0}"
 msgstr "無法讀取標籤預設組合來源 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 #, java-format
 msgid ""
@@ -12464,5 +12491,5 @@
 "<br><br><table width=600>錯誤為： [{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 #, java-format
 msgid ""
@@ -12473,5 +12500,5 @@
 "width=400>錯誤為： [{1}:{2}] {3}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:99
 #, java-format
 msgid ""
@@ -12482,5 +12509,5 @@
 "<br><br><table width=600>錯誤為：{1}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:103
 #, java-format
 msgid ""
@@ -12491,9 +12518,9 @@
 "width=600>錯誤為：{1}</table></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:136
 msgid "Sort presets menu"
 msgstr "排序預設組合選單"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:148
 msgid "Tagging Presets"
 msgstr "加上預先組合標籤"
@@ -14391,5 +14418,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:243
 msgid "no description available"
 msgstr "沒有描述可用"
@@ -14406,5 +14433,10 @@
 msgstr "外掛程式檔案「{0}」沒有包含 Manifest。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:161
+#, java-format
+msgid "Invalid URL ''{0}'' in plugin {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
 msgid "More info..."
 msgstr "更多資訊..."
@@ -14826,5 +14858,5 @@
 "警告：無法從 JOSM 地區代碼「{0}」取得 wiki 語言前綴。使用預設的代碼「en」。"
 
-#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
 msgid ""
 "Failed to open URL. There is currently no platform set. Please set a "
@@ -14925,4 +14957,28 @@
 msgstr "偏好設定的設定鍵「{0}」不存在。不能從偏好設定中回復視窗位置大小。"
 
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:313
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
+#, fuzzy
+msgid "Layer Properties"
+msgstr "改變屬性"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import image"
+msgstr "匯入圖片"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#, fuzzy
+msgid "Import georeferenced image"
+msgstr "抓取非地理參照的圖片"
+
+#: ../plugins/00_plugin_dir_template/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#, fuzzy
+msgid "Error while creating image layer: "
+msgstr "在建立已移除圖層的備份時發生錯誤：{0}"
+
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
@@ -15281,4 +15337,5 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
 msgstr "對齊路徑"
@@ -15299,5 +15356,5 @@
 msgstr ""
 
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:165
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
 msgstr "準備就緒！"
@@ -15305,5 +15362,5 @@
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
 #. Take Main.map as frame as it's better to inherit its icon than the default Java cup
-#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
 msgstr "AlignWays 密訣"
@@ -15847,8 +15904,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2670 build/trans_style.java:1018
-#: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3557
-#: build/trans_style.java:3565
+#: build/trans_presets.java:2670 build/trans_style.java:1079
+#: build/trans_style.java:1096 build/trans_style.java:1112
+#: build/trans_style.java:1119 build/trans_style.java:3618
+#: build/trans_style.java:3626
 msgid "water"
 msgstr "水域"
@@ -15909,6 +15966,6 @@
 #. color address
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4425 build/trans_style.java:4432
-#: build/trans_style.java:4439 build/trans_style.java:4446
+#: build/trans_style.java:4518 build/trans_style.java:4525
+#: build/trans_style.java:4532 build/trans_style.java:4539
 msgid "address"
 msgstr "住址"
@@ -16386,6 +16443,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Blank Layer"
 msgstr "空白圖層"
@@ -16607,6 +16664,15 @@
 msgstr "找不到 GPX 資料圖層。"
 
-#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:189
-msgid "Child script have returned invalid data."
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:127
+#, fuzzy
+msgid "External tool error"
+msgstr "外部工具"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:217
+#, fuzzy
+msgid ""
+"Child script have returned invalid data.\n"
+"\n"
+"stderr contents:"
 msgstr "子命令稿傳回了無效的資料。"
 
@@ -16629,5 +16695,5 @@
 #. Plugin ext_tools
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
-#: build/trans_plugins.java:26
+#: build/trans_plugins.java:30
 msgid "Use external scripts in JOSM"
 msgstr "使用 JOSM 外部命令稿"
@@ -17338,5 +17404,5 @@
 msgstr "您必須選擇至少兩條路徑。"
 
-#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:48
 msgid "OpenLayers"
 msgstr "OpenLayers"
@@ -18115,4 +18181,9 @@
 msgstr "輸入重量限制值"
 
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "{0} 的新數值"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
@@ -19981,5 +20052,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:35
 msgid "Turnrestriction"
-msgstr "Turnrestriction"
+msgstr "轉彎限制"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:36
@@ -20092,5 +20163,5 @@
 #. color area
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4404
+#: build/trans_style.java:4497
 msgid "area"
 msgstr "區域"
@@ -20226,140 +20297,146 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:91
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
 #, java-format
 msgid "{0} {1}% of GPS track"
 msgstr "{0} {1}% 的 GPS 軌跡"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:112
 msgid "Shows current position in the video"
 msgstr "顯示目前在影片中的位置"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Import Video"
 msgstr "匯入影片"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:116
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:117
 msgid "Sync a video against this GPS track"
 msgstr "將影片與這個 GPS 軌跡同步"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "Remove Video"
 msgstr "移除影片"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:140
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:141
 msgid "removes current video from layer"
 msgstr "將目前的影片從圖層中移除"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
-msgid "play/pause"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
+#, fuzzy
+msgid "Play/Pause"
 msgstr "播放/暫停"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:148
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:149
 msgid "starts/pauses video playback"
 msgstr "開始/暫停影片的播放"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
-msgid "backward"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
+#, fuzzy
+msgid "Backward"
 msgstr "倒轉"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:155
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "jumps n sec back"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
-msgid "jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:168
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
+#, fuzzy
+msgid "Jump To"
+msgstr "高速快轉"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "jumps to the entered gps time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:170
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:165
 msgid "please enter GPS timecode"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
-msgid "forward"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
+#, fuzzy
+msgid "Forward"
 msgstr "快轉"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:186
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:181
 msgid "jumps n sec forward"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
-msgid "faster"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
+#, fuzzy
+msgid "Faster"
 msgstr "加速"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:194
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:189
 msgid "faster playback"
 msgstr "加速播放"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
-msgid "slower"
-msgstr "減速"
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:202
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
+#, fuzzy
+msgid "Slower"
+msgstr "放慢"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:197
 msgid "slower playback"
 msgstr "減速播放"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
-msgid "loop"
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
+#, fuzzy
+msgid "Loop"
 msgstr "循環"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:210
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "loops n sec around current position"
 msgstr "在目前的地點循環播放 n 秒"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "Keep centered"
 msgstr "保持置中"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:220
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:215
 msgid "follows the video icon automaticly"
 msgstr "自動跟隨影片圖示"
 
 #. now the options menu
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Subtitles"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:230
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:226
 msgid "Show subtitles in video"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
 msgid "Jump length"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:234
+msgid "Set the length of a jump"
+msgstr ""
+
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:238
-msgid "Set the length of a jump"
-msgstr ""
-
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:242
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
 msgid "Jump in video for x ms"
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:253
 msgid "Loop length"
 msgstr "循環長度"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:249
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:245
 msgid "Set the length around a looppoint"
 msgstr "設定循環點的長度"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:262
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:258
 msgid "no deinterlacing"
 msgstr "沒有非交錯式"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:270
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:266
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:278
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:274
 msgid "deinterlacing using linear interpolation"
 msgstr ""
@@ -20377,4 +20454,8 @@
 msgid "play"
 msgstr "播放"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:130
+msgid "loop"
+msgstr "循環"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
@@ -20475,6 +20556,12 @@
 msgstr "節點「{0}」是 2 條以上連接路徑的匯集點。"
 
+#. search field
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
+#, fuzzy
+msgid "Enter search expression here.."
+msgstr "請輸入搜尋詞句"
+
 #. add label
-#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:53
+#: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
 msgstr ""
@@ -20502,5 +20589,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:81
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "Menu Name"
 msgstr "選單名稱"
@@ -20511,6 +20598,7 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Layers"
-msgstr ""
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "運動設施"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -20541,5 +20629,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:168
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
 msgid "WMS URL"
 msgstr "WMS URL"
@@ -20673,24 +20761,24 @@
 "這可能會導致錯誤的坐標。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:125
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr "警告：不使用 WMS 圖層，因為基礎 url「{0}」格式錯誤"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:139
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:127
 msgid "(deactivated)"
 msgstr "(不使用)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:187
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:181
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS 圖層 ({0})，於縮放 {1} 自動下載"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS 圖層 ({0})，於縮放 {1} 下載"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:237
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:230
 #, java-format
 msgid ""
@@ -20704,80 +20792,80 @@
 "WMS 拼貼？"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:245
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
 msgid "Yes, fetch images"
 msgstr "是，抓取圖片"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:244
 msgid "Invalid URL?"
 msgstr "無效的 URL？"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:527
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:520
 msgid "Download visible tiles"
 msgstr "下載可見的拼貼"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:533
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:526
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr "要求的區域太大。請拉近一點，或是改變解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:545
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:538
 msgid "Change resolution"
 msgstr "改變解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:558
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:551
 msgid "Reload erroneous tiles"
 msgstr "重新載入錯誤的拼貼"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:579
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:572
 msgid "Alpha channel"
 msgstr "透明色版"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:607
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:600
 msgid "Save WMS layer to file"
 msgstr "將 WMS 圖層儲存為檔案"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:611
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer"
 msgstr "儲存 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
 msgid "Load WMS layer from file"
 msgstr "從檔案載入 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:639
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer"
 msgstr "載入 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:650
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:643
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "不支援的 WMS 檔案版本；發現 {0}，應為 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:651
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:644
 msgid "File Format Error"
 msgstr "檔案格式錯誤"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:683
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "載入檔案有錯誤"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:697
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "設定 WMS 書籤"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:723
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:700
 msgid "Automatic downloading"
 msgstr "自動下載"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:154
 msgid "Could not initialize remote control."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:159
 #, java-format
 msgid "Remote control plugin is not compatible with {0}."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:179
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:165
 #, java-format
 msgid ""
@@ -20786,5 +20874,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:182
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
 #, java-format
 msgid ""
@@ -20794,73 +20882,84 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:194
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
 #, java-format
 msgid "{0}: Problem with remote control"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:230
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:243
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "開啓空白 WMS 圖層以便自檔案載入資料"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "WMS Plugin Preferences"
 msgstr "WMS 外掛程式偏好設定"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "修改在 WMS 外掛程式選單中顯示的 WMS 伺服器清單"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
+msgid "Add WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Copy Selected Default(s)"
+msgstr "複製已選取的預設值"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:123
+msgid "Please select at least one row to copy."
+msgstr "請選擇至少一列來複製。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+msgid "Downloader:"
+msgstr "下載器："
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "Overlap tiles"
+msgstr "重疊拼貼"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+msgid "% of east:"
+msgstr "% 東："
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgid "% of north:"
+msgstr "% 北："
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
+msgid "Simultaneous connections"
+msgstr "同時連線"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
+msgid "Allow remote control (reqires remotecontrol plugin)"
+msgstr "允許遠端控制（需要 remotecontrol 外掛程式）"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:263
+#, fuzzy
+msgctxt "layer"
+msgid "Zoom"
+msgstr "縮放"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "Menu Name (Default)"
 msgstr "選單名稱（預設值）"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:309
 msgid "WMS URL (Default)"
 msgstr "WMS URL（預設值）"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Add WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
-msgid "Copy Selected Default(s)"
-msgstr "複製已選取的預設值"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
-msgid "Please select at least one row to copy."
-msgstr "請選擇至少一列來複製。"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
-msgid "Downloader:"
-msgstr "下載器："
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
-msgid "Overlap tiles"
-msgstr "重疊拼貼"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
-msgid "% of east:"
-msgstr "% 東："
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
-msgid "% of north:"
-msgstr "% 北："
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
-msgid "Simultaneous connections"
-msgstr "同時連線"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Allow remote control (reqires remotecontrol plugin)"
-msgstr ""
-
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
 msgid ""
 "Remote Control has been asked to load a WMS layer from the following URL:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
+#, fuzzy
+msgid "Remote WMS"
+msgstr "移除"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20925,5 +21024,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/specialmessages.java:15 build/trans_style.java:3293
+#: build/specialmessages.java:15 build/trans_style.java:3354
 msgid "forest"
 msgstr "森林"
@@ -21217,6 +21316,12 @@
 msgstr "彩度："
 
+#. Plugin ImportImagePlugin
+#: build/trans_plugins.java:3 build/trans_plugins.java:5
+#: build/trans_plugins.java:40 build/trans_plugins.java:42
+msgid "Plugin for importing spatial referenced images"
+msgstr ""
+
 #. Plugin AddrInterpolation
-#: build/trans_plugins.java:3
+#: build/trans_plugins.java:7
 msgid ""
 "Group common Address Interpolation inputs in a single dialog, as well as an "
@@ -21228,15 +21333,15 @@
 #. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:6
+#: build/trans_plugins.java:10
 msgid "Tools for drawing buildings."
 msgstr "繪製建築物的工具。"
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:8
+#: build/trans_plugins.java:12
 msgid "A special handler for the French land registry WMS server."
 msgstr "用於法國土地登記 WMS 伺服器的特別處理程式。"
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:10
+#: build/trans_plugins.java:14
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -21251,10 +21356,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:12
+#: build/trans_plugins.java:16
 msgid "Create a grid of ways."
 msgstr "建立路徑的格線。"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:14
+#: build/trans_plugins.java:18
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -21262,10 +21367,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:16
+#: build/trans_plugins.java:20
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "允許直接將多種檔案格式匯入 JOSM。"
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:18
+#: build/trans_plugins.java:22
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -21276,15 +21381,15 @@
 
 #. Plugin download_along
-#: build/trans_plugins.java:20
+#: build/trans_plugins.java:24
 msgid "Downloads OSM data along a way"
 msgstr "沿路徑下載 OSM 資料"
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:22
+#: build/trans_plugins.java:26
 msgid "Duplicate Ways with an offset"
 msgstr "重製路徑並位移"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:24
+#: build/trans_plugins.java:28
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -21293,20 +21398,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:28
+#: build/trans_plugins.java:32
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "在 JOSM 中直接從 Globalsat dg100 資料記錄器下載 GPS 點。"
 
 #. Plugin graphview
-#: build/trans_plugins.java:30
+#: build/trans_plugins.java:34
 msgid "Visualizes routing information as a routing graph."
 msgstr "以路線圖顯示視覺化路線資訊"
 
 #. Plugin grid
-#: build/trans_plugins.java:32
+#: build/trans_plugins.java:36
 msgid "Provide a background layer that displays a map grid"
 msgstr "提供顯示地圖格線的背景圖層"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:34
+#: build/trans_plugins.java:38
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -21318,15 +21423,15 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:36
+#: build/trans_plugins.java:44
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:38
+#: build/trans_plugins.java:46
 msgid "Helps vectorizing WMS images."
 msgstr "協助將 WMS 圖片向量化。"
 
 #. Plugin livegps
-#: build/trans_plugins.java:40
+#: build/trans_plugins.java:48
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -21334,5 +21439,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:42
+#: build/trans_plugins.java:50
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -21344,15 +21449,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:44
+#: build/trans_plugins.java:52
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:46
+#: build/trans_plugins.java:54
 msgid "Simply convert an area to a multipolygon."
 msgstr "只把區域轉換為多重多邊形。"
 
 #. Plugin multipoly
-#: build/trans_plugins.java:48
+#: build/trans_plugins.java:56
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -21361,5 +21466,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:50
+#: build/trans_plugins.java:58
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -21371,20 +21476,20 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:52
+#: build/trans_plugins.java:60
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openlayers
-#: build/trans_plugins.java:54
+#: build/trans_plugins.java:62
 msgid "Displays an OpenLayers background image"
 msgstr "顯示 OpenLayers 背景圖片"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:64
 msgid "Imports issues from OpenStreetBugs"
 msgstr "匯入OpenStreetBugs 的議題"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:66
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -21392,5 +21497,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:68
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -21398,5 +21503,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:70
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -21406,5 +21511,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:64
+#: build/trans_plugins.java:72
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -21413,10 +21518,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:66
+#: build/trans_plugins.java:74
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "超棒的 JGoodies 塑膠外觀與感覺。"
 
 #. Plugin public_transport
-#: build/trans_plugins.java:68
+#: build/trans_plugins.java:76
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -21424,15 +21529,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:70
+#: build/trans_plugins.java:78
 msgid "Let other applications send commands to JOSM."
 msgstr "讓其他的應用程式傳送指令給 JOSM。"
 
 #. Plugin reverter
-#: build/trans_plugins.java:72
+#: build/trans_plugins.java:80
 msgid "Plugin for reverting changesets"
 msgstr "還原變更組合的外掛程式"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:74
+#: build/trans_plugins.java:82
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -21444,5 +21549,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:76
+#: build/trans_plugins.java:84
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21453,10 +21558,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:78
+#: build/trans_plugins.java:86
 msgid "Provides routing capabilities."
 msgstr "提供路線規畫的功能。"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:80
+#: build/trans_plugins.java:88
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21467,5 +21572,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:82
+#: build/trans_plugins.java:90
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21474,16 +21579,31 @@
 "在 JOSM 中顯示快速地圖格線。可以從快速地圖中載入拼貼作為背景並要求更新。"
 
+#. Plugin smed
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:92 build/trans_plugins.java:94
+#: build/trans_plugins.java:98
+msgid "Create and edit seamaps for OpenSeaMap"
+msgstr ""
+
+#. Plugin smed_about
+#. Plugin smed_ex
+#: build/trans_plugins.java:96 build/trans_plugins.java:100
+#, fuzzy
+msgid "Plugin for Seamap Editor"
+msgstr "外掛程式資訊"
+
 #. Plugin surveyor
-#: build/trans_plugins.java:84
+#: build/trans_plugins.java:102
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "允許在目前的 gps 位置加入標記/節點。"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:86
+#: build/trans_plugins.java:104
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "提供在表格線中編輯標籤的對話盒。"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:106
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21495,15 +21615,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:108
 msgid "Make terraced houses out of single blocks."
 msgstr "讓連棟房屋能超出單一區塊。"
 
 #. Plugin toms
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:110
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:112
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21512,5 +21632,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:114
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21519,5 +21639,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:116
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21528,10 +21648,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:118
 msgid "Allows undeleting object from OSM database"
 msgstr "允許從 OSM 資料庫中取消物件的刪除"
 
 #. Plugin validator
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:120
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21542,5 +21662,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:122
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21552,5 +21672,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:124
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21561,20 +21681,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:126
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "方便的下載一整組互相聯結的路徑"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:110
+#: build/trans_plugins.java:128
 msgid "Enables searching for waypoint imported from gpx file."
-msgstr ""
+msgstr "啟用搜尋從 gpx 檔案匯入的航點。"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:112
+#: build/trans_plugins.java:130
 msgid "Select a sequence of non-branching connected ways"
 msgstr "選擇非分支連接的路徑次序"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:114
+#: build/trans_plugins.java:132
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21583,5 +21703,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:116
+#: build/trans_plugins.java:134
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22475,4 +22595,48 @@
 #. </rule>
 #.
+#. <!-- traffic_calming tag -->
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="bump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="hump"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="table"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_calming" v="chicane"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="choker"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cushion"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <!-- junction tag -->
 #.
@@ -22480,5 +22644,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:373 build/trans_style.java:923
+#: build/trans_presets.java:373 build/trans_style.java:984
 msgid "roundabout"
 msgstr "圓環"
@@ -22985,5 +23149,5 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:412 build/trans_style.java:3317
+#: build/trans_presets.java:412 build/trans_style.java:3378
 msgid "residential"
 msgstr "居住的"
@@ -23032,5 +23196,5 @@
 #. color service
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4476
+#: build/trans_style.java:4569
 msgid "service"
 msgstr "巷/弄"
@@ -23063,6 +23227,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3382 build/trans_style.java:3383
+#: build/trans_presets.java:412 build/trans_style.java:922
+#: build/trans_style.java:3443 build/trans_style.java:3444
 msgid "construction"
 msgstr "施工"
@@ -24221,5 +24385,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1086 build/trans_style.java:3549
+#: build/trans_presets.java:1086 build/trans_style.java:3610
 msgid "marsh"
 msgstr ""
@@ -24417,7 +24581,7 @@
 #: build/trans_style.java:715 build/trans_style.java:723
 #: build/trans_style.java:748 build/trans_style.java:757
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
-#: build/trans_style.java:966
+#: build/trans_style.java:995 build/trans_style.java:1003
+#: build/trans_style.java:1011 build/trans_style.java:1019
+#: build/trans_style.java:1027
 msgid "bicycle"
 msgstr "單車"
@@ -24693,8 +24857,8 @@
 #: build/trans_presets.java:1231 build/trans_presets.java:1243
 #: build/trans_presets.java:1255 build/trans_style.java:781
-#: build/trans_style.java:1207 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1288
-#: build/trans_style.java:1296 build/trans_style.java:1304
-#: build/trans_style.java:1305 build/trans_style.java:1312
+#: build/trans_style.java:1268 build/trans_style.java:1332
+#: build/trans_style.java:1340 build/trans_style.java:1349
+#: build/trans_style.java:1357 build/trans_style.java:1365
+#: build/trans_style.java:1366 build/trans_style.java:1373
 msgid "rail"
 msgstr "軌"
@@ -26130,5 +26294,5 @@
 #: build/trans_presets.java:1870 build/trans_presets.java:1889
 #: build/trans_presets.java:1908 build/trans_presets.java:1924
-#: build/trans_presets.java:1941 build/trans_style.java:1352
+#: build/trans_presets.java:1941 build/trans_style.java:1413
 msgid "terminal"
 msgstr ""
@@ -27401,32 +27565,66 @@
 #. <condition k="sport" v="fishing"/>
 #. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="safety_training"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="model_aerodrome"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rc_car"/>
+#. color sport
 #: build/trans_presets.java:2196 build/trans_presets.java:2205
 #: build/trans_presets.java:2214 build/trans_presets.java:2223
-#: build/trans_style.java:3770 build/trans_style.java:3778
-#: build/trans_style.java:3786 build/trans_style.java:3794
-#: build/trans_style.java:3802 build/trans_style.java:3810
-#: build/trans_style.java:3818 build/trans_style.java:3826
-#: build/trans_style.java:3834 build/trans_style.java:3842
-#: build/trans_style.java:3850 build/trans_style.java:3858
-#: build/trans_style.java:3866 build/trans_style.java:3874
-#: build/trans_style.java:3882 build/trans_style.java:3890
-#: build/trans_style.java:3898 build/trans_style.java:3906
-#: build/trans_style.java:3914 build/trans_style.java:3922
-#: build/trans_style.java:3930 build/trans_style.java:3938
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106 build/trans_style.java:4114
-#: build/trans_style.java:4122 build/trans_style.java:4130
-#: build/trans_style.java:4138 build/trans_style.java:4146
-#: build/trans_style.java:4154 build/trans_style.java:4162
-#: build/trans_style.java:4170 build/trans_style.java:4178
+#: build/trans_style.java:3831 build/trans_style.java:3839
+#: build/trans_style.java:3847 build/trans_style.java:3855
+#: build/trans_style.java:3863 build/trans_style.java:3871
+#: build/trans_style.java:3879 build/trans_style.java:3887
+#: build/trans_style.java:3895 build/trans_style.java:3903
+#: build/trans_style.java:3911 build/trans_style.java:3919
+#: build/trans_style.java:3927 build/trans_style.java:3935
+#: build/trans_style.java:3943 build/trans_style.java:3951
+#: build/trans_style.java:3959 build/trans_style.java:3967
+#: build/trans_style.java:3975 build/trans_style.java:3983
+#: build/trans_style.java:3991 build/trans_style.java:3999
+#: build/trans_style.java:4007 build/trans_style.java:4015
+#: build/trans_style.java:4023 build/trans_style.java:4031
+#: build/trans_style.java:4039 build/trans_style.java:4047
+#: build/trans_style.java:4055 build/trans_style.java:4063
+#: build/trans_style.java:4071 build/trans_style.java:4079
+#: build/trans_style.java:4087 build/trans_style.java:4095
+#: build/trans_style.java:4103 build/trans_style.java:4111
+#: build/trans_style.java:4119 build/trans_style.java:4127
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231 build/trans_style.java:4239
+#: build/trans_style.java:4247 build/trans_style.java:4255
+#: build/trans_style.java:4263 build/trans_style.java:4271
 msgid "sport"
 msgstr "運動"
@@ -29223,9 +29421,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_presets.java:2806 build/trans_style.java:3222
-#: build/trans_style.java:3230 build/trans_style.java:3238
-#: build/trans_style.java:3246 build/trans_style.java:3254
-#: build/trans_style.java:3301 build/trans_style.java:3309
-#: build/trans_style.java:3407 build/trans_style.java:3415
+#: build/trans_presets.java:2806 build/trans_style.java:3283
+#: build/trans_style.java:3291 build/trans_style.java:3299
+#: build/trans_style.java:3307 build/trans_style.java:3315
+#: build/trans_style.java:3362 build/trans_style.java:3370
+#: build/trans_style.java:3468 build/trans_style.java:3476
 msgid "green"
 msgstr "綠色"
@@ -30888,5 +31086,5 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:3612 build/trans_style.java:1233
+#: build/trans_presets.java:3612 build/trans_style.java:1294
 msgid "subway"
 msgstr "地下鐵"
@@ -31167,5 +31365,5 @@
 #. <condition k="highway" v="road"/>
 #. color deprecated
-#. <icon annotate="true" src="sport/fishing.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31183,5 +31381,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4192
+#: build/trans_style.java:633 build/trans_style.java:4285
 msgid "deprecated"
 msgstr "已廢棄"
@@ -31558,7 +31756,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:649 build/trans_style.java:976
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:1000 build/trans_style.java:1008
+#: build/trans_style.java:649 build/trans_style.java:1037
+#: build/trans_style.java:1045 build/trans_style.java:1053
+#: build/trans_style.java:1061 build/trans_style.java:1069
 msgid "highway_track"
 msgstr ""
@@ -31650,9 +31848,17 @@
 #. <condition k="highway" v="services"/>
 #. color services
-#: build/trans_style.java:867
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="rest_area"/>
+#. color services
+#: build/trans_style.java:867 build/trans_style.java:875
 msgid "services"
 msgstr ""
 
-#. <icon annotate="true" src="vehicle/services.png"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -31662,5 +31868,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:875
+#: build/trans_style.java:883
 msgid "ford"
 msgstr ""
@@ -31679,7 +31885,20 @@
 #.
 #. <rule>
+#. <condition k="highway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color highway_platform
+#: build/trans_style.java:899 build/trans_style.java:900
+#, fuzzy
+msgid "highway_platform"
+msgstr "鐵路月台"
+
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:890
+#: build/trans_style.java:907
 msgid "turningcircle"
 msgstr ""
@@ -31694,5 +31913,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:914
+#: build/trans_style.java:931
 msgid "emergency_access_point"
 msgstr "緊急連絡點"
@@ -31706,5 +31925,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1026 build/trans_style.java:1027
+#: build/trans_style.java:1087 build/trans_style.java:1088
 msgid "riverbank"
 msgstr "河岸"
@@ -31718,5 +31937,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:1043
+#: build/trans_style.java:1104
 msgid "stream"
 msgstr "溪流"
@@ -31730,5 +31949,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:1066
+#: build/trans_style.java:1127
 msgid "dock"
 msgstr ""
@@ -31932,14 +32151,14 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#: build/trans_style.java:1089 build/trans_style.java:1118
-#: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1636
-#: build/trans_style.java:1643 build/trans_style.java:1651
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1731 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764 build/trans_style.java:1772
+#: build/trans_style.java:1150 build/trans_style.java:1179
+#: build/trans_style.java:1195 build/trans_style.java:1196
+#: build/trans_style.java:1204 build/trans_style.java:1697
+#: build/trans_style.java:1704 build/trans_style.java:1712
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1761 build/trans_style.java:1769
+#: build/trans_style.java:1777 build/trans_style.java:1785
+#: build/trans_style.java:1792 build/trans_style.java:1801
+#: build/trans_style.java:1809 build/trans_style.java:1817
+#: build/trans_style.java:1825 build/trans_style.java:1833
 msgid "manmade"
 msgstr ""
@@ -31953,5 +32172,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:1126
+#: build/trans_style.java:1187
 msgid "rapids"
 msgstr ""
@@ -32013,7 +32232,7 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:1153 build/trans_style.java:1168
-#: build/trans_style.java:1183 build/trans_style.java:1191
-#: build/trans_style.java:1199
+#: build/trans_style.java:1214 build/trans_style.java:1229
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1260
 msgid "railwaypoint"
 msgstr ""
@@ -32036,10 +32255,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:1216 build/trans_style.java:1225
+#: build/trans_style.java:1277 build/trans_style.java:1286
 msgid "otherrail"
 msgstr ""
 
 #. color railover
-#: build/trans_style.java:1217
+#: build/trans_style.java:1278
 msgid "railover"
 msgstr ""
@@ -32073,7 +32292,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1241 build/trans_style.java:1251
-#: build/trans_style.java:1252 build/trans_style.java:1262
-#: build/trans_style.java:1263
+#: build/trans_style.java:1302 build/trans_style.java:1312
+#: build/trans_style.java:1313 build/trans_style.java:1323
+#: build/trans_style.java:1324
 msgid "oldrail"
 msgstr ""
@@ -32118,6 +32337,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1343 build/trans_style.java:1344
-#: build/trans_style.java:1376
+#: build/trans_style.java:1404 build/trans_style.java:1405
+#: build/trans_style.java:1437
 msgid "aeroway"
 msgstr ""
@@ -32139,5 +32358,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1360 build/trans_style.java:1368
+#: build/trans_style.java:1421 build/trans_style.java:1429
 msgid "aeroway_dark"
 msgstr ""
@@ -32151,5 +32370,5 @@
 #. <condition k="aeroway" v="apron"/>
 #. color aeroway_light
-#: build/trans_style.java:1384
+#: build/trans_style.java:1445
 msgid "aeroway_light"
 msgstr ""
@@ -32227,8 +32446,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1408 build/trans_style.java:1416
-#: build/trans_style.java:1424 build/trans_style.java:1432
-#: build/trans_style.java:1440 build/trans_style.java:1448
-#: build/trans_style.java:1456
+#: build/trans_style.java:1469 build/trans_style.java:1477
+#: build/trans_style.java:1485 build/trans_style.java:1493
+#: build/trans_style.java:1501 build/trans_style.java:1509
+#: build/trans_style.java:1517
 msgid "aerialway"
 msgstr ""
@@ -32244,5 +32463,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1466 build/trans_style.java:1467
+#: build/trans_style.java:1527 build/trans_style.java:1528
 msgid "piste_easy"
 msgstr ""
@@ -32256,5 +32475,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1475 build/trans_style.java:1476
+#: build/trans_style.java:1536 build/trans_style.java:1537
 msgid "piste_intermediate"
 msgstr ""
@@ -32268,5 +32487,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1484 build/trans_style.java:1485
+#: build/trans_style.java:1545 build/trans_style.java:1546
 msgid "piste_advanced"
 msgstr ""
@@ -32280,5 +32499,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1493 build/trans_style.java:1494
+#: build/trans_style.java:1554 build/trans_style.java:1555
 msgid "piste_expert"
 msgstr ""
@@ -32292,5 +32511,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1502 build/trans_style.java:1503
+#: build/trans_style.java:1563 build/trans_style.java:1564
 msgid "piste_freeride"
 msgstr ""
@@ -32304,5 +32523,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1511 build/trans_style.java:1512
+#: build/trans_style.java:1572 build/trans_style.java:1573
 msgid "piste_novice"
 msgstr ""
@@ -32422,11 +32641,11 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1523 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1554
-#: build/trans_style.java:1562 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1602
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626
+#: build/trans_style.java:1584 build/trans_style.java:1598
+#: build/trans_style.java:1606 build/trans_style.java:1615
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1671 build/trans_style.java:1679
+#: build/trans_style.java:1687
 msgid "power"
 msgstr ""
@@ -32439,5 +32658,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1675 build/trans_style.java:1676
+#: build/trans_style.java:1736 build/trans_style.java:1737
 msgid "pier"
 msgstr ""
@@ -32451,5 +32670,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1684
+#: build/trans_style.java:1745
 msgid "pipeline"
 msgstr ""
@@ -32593,13 +32812,13 @@
 #. <icon annotate="true" src="sport/hockey.png"/>
 #. color leisure
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814 build/trans_style.java:1822
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1910
-#: build/trans_style.java:1918
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1899 build/trans_style.java:1907
+#: build/trans_style.java:1915 build/trans_style.java:1923
+#: build/trans_style.java:1931 build/trans_style.java:1939
+#: build/trans_style.java:1947 build/trans_style.java:1955
+#: build/trans_style.java:1963 build/trans_style.java:1971
+#: build/trans_style.java:1979
 msgid "leisure"
 msgstr ""
@@ -32613,5 +32832,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1830
+#: build/trans_style.java:1891
 msgid "marina"
 msgstr ""
@@ -32707,10 +32926,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992 build/trans_style.java:2000
-#: build/trans_style.java:2008
+#: build/trans_style.java:1989 build/trans_style.java:1997
+#: build/trans_style.java:2005 build/trans_style.java:2013
+#: build/trans_style.java:2021 build/trans_style.java:2029
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2069
 msgid "amenity"
 msgstr ""
@@ -32820,11 +33039,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:2016 build/trans_style.java:2024
-#: build/trans_style.java:2032 build/trans_style.java:2040
-#: build/trans_style.java:2048 build/trans_style.java:2056
-#: build/trans_style.java:2064 build/trans_style.java:2072
-#: build/trans_style.java:2080 build/trans_style.java:2088
-#: build/trans_style.java:2095 build/trans_style.java:2104
-#: build/trans_style.java:2112
+#: build/trans_style.java:2077 build/trans_style.java:2085
+#: build/trans_style.java:2093 build/trans_style.java:2101
+#: build/trans_style.java:2109 build/trans_style.java:2117
+#: build/trans_style.java:2125 build/trans_style.java:2133
+#: build/trans_style.java:2141 build/trans_style.java:2149
+#: build/trans_style.java:2156 build/trans_style.java:2165
+#: build/trans_style.java:2173
 msgid "amenity_traffic"
 msgstr ""
@@ -33262,24 +33481,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:2127 build/trans_style.java:2142
-#: build/trans_style.java:2150 build/trans_style.java:2158
-#: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2312 build/trans_style.java:2320
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2352
-#: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2447 build/trans_style.java:2455
-#: build/trans_style.java:2463 build/trans_style.java:2472
-#: build/trans_style.java:2480 build/trans_style.java:2487
-#: build/trans_style.java:2495 build/trans_style.java:2503
-#: build/trans_style.java:2511 build/trans_style.java:2519
-#: build/trans_style.java:2527 build/trans_style.java:2535
-#: build/trans_style.java:2543 build/trans_style.java:2551
-#: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2583
-#: build/trans_style.java:2591 build/trans_style.java:2600
-#: build/trans_style.java:2615
+#: build/trans_style.java:2188 build/trans_style.java:2203
+#: build/trans_style.java:2211 build/trans_style.java:2219
+#: build/trans_style.java:2234 build/trans_style.java:2242
+#: build/trans_style.java:2250 build/trans_style.java:2258
+#: build/trans_style.java:2373 build/trans_style.java:2381
+#: build/trans_style.java:2388 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2508 build/trans_style.java:2516
+#: build/trans_style.java:2524 build/trans_style.java:2533
+#: build/trans_style.java:2541 build/trans_style.java:2548
+#: build/trans_style.java:2556 build/trans_style.java:2564
+#: build/trans_style.java:2572 build/trans_style.java:2580
+#: build/trans_style.java:2588 build/trans_style.java:2596
+#: build/trans_style.java:2604 build/trans_style.java:2612
+#: build/trans_style.java:2620 build/trans_style.java:2628
+#: build/trans_style.java:2636 build/trans_style.java:2644
+#: build/trans_style.java:2652 build/trans_style.java:2661
+#: build/trans_style.java:2676
 msgid "amenity_light"
 msgstr ""
@@ -33311,6 +33530,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:2205 build/trans_style.java:2213
-#: build/trans_style.java:3468
+#: build/trans_style.java:2266 build/trans_style.java:2274
+#: build/trans_style.java:3529
 msgid "light_water"
 msgstr ""
@@ -33371,8 +33590,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2416
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439
+#: build/trans_style.java:2452 build/trans_style.java:2460
+#: build/trans_style.java:2468 build/trans_style.java:2477
+#: build/trans_style.java:2484 build/trans_style.java:2492
+#: build/trans_style.java:2500
 msgid "health"
 msgstr ""
@@ -33733,26 +33952,26 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2737 build/trans_style.java:2745
-#: build/trans_style.java:2753 build/trans_style.java:2761
-#: build/trans_style.java:2769 build/trans_style.java:2777
-#: build/trans_style.java:2785 build/trans_style.java:2793
-#: build/trans_style.java:2801 build/trans_style.java:2809
-#: build/trans_style.java:2817 build/trans_style.java:2825
-#: build/trans_style.java:2833 build/trans_style.java:2841
-#: build/trans_style.java:2849 build/trans_style.java:2857
-#: build/trans_style.java:2865 build/trans_style.java:2873
-#: build/trans_style.java:2881 build/trans_style.java:2889
-#: build/trans_style.java:2897 build/trans_style.java:2905
-#: build/trans_style.java:2913 build/trans_style.java:2921
-#: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2945 build/trans_style.java:2953
-#: build/trans_style.java:2961 build/trans_style.java:2970
+#: build/trans_style.java:2686 build/trans_style.java:2694
+#: build/trans_style.java:2702 build/trans_style.java:2710
+#: build/trans_style.java:2718 build/trans_style.java:2726
+#: build/trans_style.java:2734 build/trans_style.java:2742
+#: build/trans_style.java:2750 build/trans_style.java:2758
+#: build/trans_style.java:2766 build/trans_style.java:2774
+#: build/trans_style.java:2782 build/trans_style.java:2790
+#: build/trans_style.java:2798 build/trans_style.java:2806
+#: build/trans_style.java:2814 build/trans_style.java:2822
+#: build/trans_style.java:2830 build/trans_style.java:2838
+#: build/trans_style.java:2846 build/trans_style.java:2854
+#: build/trans_style.java:2862 build/trans_style.java:2870
+#: build/trans_style.java:2878 build/trans_style.java:2886
+#: build/trans_style.java:2894 build/trans_style.java:2902
+#: build/trans_style.java:2910 build/trans_style.java:2918
+#: build/trans_style.java:2926 build/trans_style.java:2934
+#: build/trans_style.java:2942 build/trans_style.java:2950
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3031
 msgid "shop"
 msgstr ""
@@ -33824,8 +34043,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
+#: build/trans_style.java:3041 build/trans_style.java:3049
+#: build/trans_style.java:3057 build/trans_style.java:3065
+#: build/trans_style.java:3073 build/trans_style.java:3081
+#: build/trans_style.java:3089 build/trans_style.java:3097
 msgid "hotel"
 msgstr "旅館"
@@ -33925,9 +34144,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3060 build/trans_style.java:3068
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3085 build/trans_style.java:3093
-#: build/trans_style.java:3109 build/trans_style.java:3131
+#: build/trans_style.java:3105 build/trans_style.java:3113
+#: build/trans_style.java:3121 build/trans_style.java:3129
+#: build/trans_style.java:3137 build/trans_style.java:3145
+#: build/trans_style.java:3146 build/trans_style.java:3154
+#: build/trans_style.java:3170 build/trans_style.java:3192
 msgid "tourism"
 msgstr ""
@@ -34015,9 +34234,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:3141 build/trans_style.java:3149
-#: build/trans_style.java:3157 build/trans_style.java:3165
-#: build/trans_style.java:3173 build/trans_style.java:3181
-#: build/trans_style.java:3189 build/trans_style.java:3197
-#: build/trans_style.java:3205 build/trans_style.java:3213
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
+#: build/trans_style.java:3234 build/trans_style.java:3242
+#: build/trans_style.java:3250 build/trans_style.java:3258
+#: build/trans_style.java:3266 build/trans_style.java:3274
 msgid "historic"
 msgstr ""
@@ -34030,5 +34249,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:3261
+#: build/trans_style.java:3322
 msgid "quarry"
 msgstr ""
@@ -34042,5 +34261,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:3269
+#: build/trans_style.java:3330
 msgid "landfill"
 msgstr ""
@@ -34062,5 +34281,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3338 build/trans_style.java:3346
 msgid "basin"
 msgstr ""
@@ -34074,5 +34293,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:3325
+#: build/trans_style.java:3386
 msgid "farmyard"
 msgstr ""
@@ -34095,5 +34314,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:3334 build/trans_style.java:3342
+#: build/trans_style.java:3395 build/trans_style.java:3403
 msgid "retail"
 msgstr ""
@@ -34107,5 +34326,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:3350
+#: build/trans_style.java:3411
 msgid "industrial"
 msgstr ""
@@ -34119,5 +34338,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:3358
+#: build/trans_style.java:3419
 msgid "brownfield"
 msgstr ""
@@ -34131,5 +34350,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:3366
+#: build/trans_style.java:3427
 msgid "greenfield"
 msgstr ""
@@ -34143,5 +34362,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:3374
+#: build/trans_style.java:3435
 msgid "railland"
 msgstr ""
@@ -34198,7 +34417,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:3391 build/trans_style.java:3426
-#: build/trans_style.java:3434 build/trans_style.java:3442
-#: build/trans_style.java:3450 build/trans_style.java:3458
+#: build/trans_style.java:3452 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
 msgid "military"
 msgstr "軍事"
@@ -34212,5 +34431,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:3399
+#: build/trans_style.java:3460
 msgid "cemetery"
 msgstr ""
@@ -34223,5 +34442,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:3475
+#: build/trans_style.java:3536
 msgid "peak"
 msgstr ""
@@ -34236,5 +34455,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:3484
+#: build/trans_style.java:3545
 msgid "glacier"
 msgstr ""
@@ -34248,5 +34467,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:3492
+#: build/trans_style.java:3553
 msgid "volcano"
 msgstr "火山"
@@ -34300,8 +34519,8 @@
 #. <icon src="vehicle/tunnel.png"/>
 #. color natural
-#: build/trans_style.java:3500 build/trans_style.java:3501
-#: build/trans_style.java:3509 build/trans_style.java:3525
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605
+#: build/trans_style.java:3561 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3586
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666
 msgid "natural"
 msgstr ""
@@ -34315,5 +34534,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:3517
+#: build/trans_style.java:3578
 msgid "scrub"
 msgstr ""
@@ -34327,5 +34546,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:3533
+#: build/trans_style.java:3594
 msgid "heath"
 msgstr ""
@@ -34339,5 +34558,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:3541
+#: build/trans_style.java:3602
 msgid "woodarea"
 msgstr "樹林區"
@@ -34351,5 +34570,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color mud
-#: build/trans_style.java:3573
+#: build/trans_style.java:3634
 msgid "mud"
 msgstr ""
@@ -34363,5 +34582,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color beach
-#: build/trans_style.java:3581
+#: build/trans_style.java:3642
 msgid "beach"
 msgstr "海灘"
@@ -34439,8 +34658,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
-#: build/trans_style.java:3653 build/trans_style.java:3661
-#: build/trans_style.java:3669 build/trans_style.java:3677
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
 msgid "route"
 msgstr "路線"
@@ -34529,12 +34748,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3711
-#: build/trans_style.java:3715 build/trans_style.java:3719
-#: build/trans_style.java:3723 build/trans_style.java:3727
-#: build/trans_style.java:3731 build/trans_style.java:3736
-#: build/trans_style.java:3744 build/trans_style.java:3752
-#: build/trans_style.java:3760
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3760 build/trans_style.java:3764
+#: build/trans_style.java:3768 build/trans_style.java:3772
+#: build/trans_style.java:3776 build/trans_style.java:3780
+#: build/trans_style.java:3784 build/trans_style.java:3788
+#: build/trans_style.java:3792 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821
 msgid "boundary"
 msgstr "邊界"
@@ -34684,11 +34903,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:4240 build/trans_style.java:4248
-#: build/trans_style.java:4256 build/trans_style.java:4264
-#: build/trans_style.java:4272 build/trans_style.java:4280
-#: build/trans_style.java:4288 build/trans_style.java:4296
-#: build/trans_style.java:4304 build/trans_style.java:4312
-#: build/trans_style.java:4320 build/trans_style.java:4328
-#: build/trans_style.java:4336
+#: build/trans_style.java:4333 build/trans_style.java:4341
+#: build/trans_style.java:4349 build/trans_style.java:4357
+#: build/trans_style.java:4365 build/trans_style.java:4373
+#: build/trans_style.java:4381 build/trans_style.java:4389
+#: build/trans_style.java:4397 build/trans_style.java:4405
+#: build/trans_style.java:4413 build/trans_style.java:4421
+#: build/trans_style.java:4429
 msgid "place"
 msgstr ""
@@ -34702,5 +34921,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:4344
+#: build/trans_style.java:4437
 msgid "tiger_data"
 msgstr ""
@@ -35069,4 +35288,50 @@
 msgstr ""
 
+#~ msgid "Only up to two areas can be joined at the moment."
+#~ msgstr "目前只能連結兩個區域。"
+
+#~ msgid "Joined self-overlapping area"
+#~ msgstr "已連結自我重疊的區域"
+
+#~ msgid "Enter values for all conflicts."
+#~ msgstr "輸入所有衝突項目的數值。"
+
+#~ msgid "Solve Conflicts"
+#~ msgstr "解決衝突"
+
+#~ msgid "Join Areas: Remove Short Ways"
+#~ msgstr "連結區域：移除短路徑"
+
+#~ msgid "Closed Way"
+#~ msgstr "封閉的路徑"
+
+#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+#~ msgstr "錯誤：伺服器的書籤清單中有未預期的行「{0}」"
+
+#~ msgid ""
+#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+#~ "server"
+#~ msgstr "錯誤：伺服器的書籤清單的「{1}」行有不合格的 double 數值「{0}」"
+
+#~ msgid ""
+#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr "基於安全性的理由無法從「{0}」載入書籤。例外為：{1}"
+
+#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
+#~ msgstr "<html>無法寫入書籤。<br>{0}</html>"
+
+#~ msgid "play/pause"
+#~ msgstr "播放/暫停"
+
+#~ msgid "forward"
+#~ msgstr "快轉"
+
+#~ msgid "faster"
+#~ msgstr "加速"
+
+#~ msgid "slower"
+#~ msgstr "減速"
+
 #~ msgid "Open in Browser"
 #~ msgstr "在瀏覽器中打開"
@@ -35208,10 +35473,4 @@
 #~ msgid "Move"
 #~ msgstr "移動"
-
-#~ msgid "Split way segment"
-#~ msgstr "分割路徑區段"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "給 nodes 運算子錯誤的參數數量。"
 
 #~ msgid ""
